apktool: Always assume custom `aapt`

that does not have `--forced-package-id` option.
2021-12-21 07:02:54 +09:00 · 2021-12-21 07:02:54 +09:00 · 2e28638795
parent f820729792
commit 2e28638795
2 changed files with 12 additions and 0 deletions
--- a/packages/apktool/AndrolibResources.java.patch
+++ b/packages/apktool/AndrolibResources.java.patch
@ -0,0 +1,11 @@
+--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
+@@ -611,7 +611,7 @@
+             throws AndrolibException {
+ 
+         String aaptPath = apkOptions.aaptPath;
+-        boolean customAapt = !aaptPath.isEmpty();
+        boolean customAapt = true;
+         List<String> cmd = new ArrayList<>();
+ 
+         try {
--- a/packages/apktool/build.sh
+++ b/packages/apktool/build.sh
@ -17,6 +17,7 @@ termux_step_pre_configure() {
 		$CC $CFLAGS $CPPFLAGS aapt-wrapper/${exe_name}-wrapper.c \
 			-o ${exe_path} $LDFLAGS
 		$STRIP --strip-unneeded ${exe_path}
+		$TERMUX_ELF_CLEANER ${exe_path}
 		cp -a ${exe_path} ${exe_path}_64
 	done
 }