From 5a8bc45653797d0c4b2b957b102b02ce497428dc Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Thu, 15 Feb 2018 18:10:04 -0500 Subject: [PATCH] aapt2: aapt2 is a staged build (compile and link). - we destroy the "compile" stage item after a link, but keep the pending directory - apktool then cannot complete link stage - if aapt2 is used, lie to system and re-process - todo: rethink this --- .../apktool-lib/src/main/java/brut/androlib/Androlib.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c0d6078b..2325bcdd 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 @@ -459,7 +459,7 @@ public class Androlib { } File apkDir = new File(appDir, APK_DIRNAME); if (apkOptions.forceBuildAll || isModified(newFiles(APP_RESOURCES_FILENAMES, appDir), - newFiles(APK_RESOURCES_FILENAMES, apkDir))) { + newFiles(APK_RESOURCES_FILENAMES, apkDir)) || apkOptions.isAapt2()) { LOGGER.info("Building resources..."); if (apkOptions.debugMode) {