From fa99bdd19d13d93e08a135d2e7bdc78a253190f9 Mon Sep 17 00:00:00 2001 From: Adib Faramarzi Date: Thu, 30 May 2019 19:08:21 +0430 Subject: [PATCH] Fix removal of META-INF/services folder - copy the META-INF/services folder to the destination APK folder so it does not get dropped --- .../apktool-lib/src/main/java/brut/androlib/Androlib.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java index 2a9b86b7..41271df0 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java @@ -568,7 +568,6 @@ public class Androlib { buildLibrary(appDir, "lib"); buildLibrary(appDir, "libs"); buildLibrary(appDir, "kotlin"); - buildLibrary(appDir, "META-INF/services"); } public void buildLibrary(File appDir, String folder) throws AndrolibException { @@ -579,7 +578,7 @@ public class Androlib { } File stored = new File(appDir, APK_DIRNAME + "/" + folder); - if (apkOptions.forceBuildAll || isModified(working, stored) || folder.contains("services")) { + if (apkOptions.forceBuildAll || isModified(working, stored)) { LOGGER.info("Copying libs... (/" + folder + ")"); try { OS.rmdir(stored); @@ -797,5 +796,5 @@ public class Androlib { "AndroidManifest.xml" }; private final static String[] APK_STANDARD_ALL_FILENAMES = new String[] { "classes.dex", "AndroidManifest.xml", "resources.arsc", "res", "r", "R", - "lib", "libs", "assets", "META-INF", "kotlin"}; + "lib", "libs", "assets", "META-INF", "kotlin" }; }