From b92b13158bdf80c659ac23d2784709ea44f6deb7 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Tue, 7 Jul 2020 07:21:01 +0700
Subject: [PATCH] waf/android: prefer aapt, aapt2 has compatibility issues

---
 scripts/waifulib/android.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/waifulib/android.py b/scripts/waifulib/android.py
index ffd21006..93c58cae 100644
--- a/scripts/waifulib/android.py
+++ b/scripts/waifulib/android.py
@@ -69,9 +69,9 @@ def configure(conf):
 
 	# optional
 	try:
-		conf.find_program('aapt2', path_list = paths)
-	except Errors.ConfigurationError:
 		conf.find_program('aapt', path_list = paths)
+	except Errors.ConfigurationError:
+		conf.find_program('aapt2', path_list = paths)
 
 	# optional
 	# if conf.env.BUILD_TOOLS_VERSION[0] >= D8_BUILD_TOOLS_MAJOR_VER:
@@ -137,7 +137,7 @@ class aapt2link(javaw.JTask):
 
 class aaptpackage(javaw.JTask):
 	color = 'GREEN' # androis green :)
-	run_str = 'mkdir -p ${OUTRDIR} && ${AAPT} p -v -F ${TGT} -J ${OUTRDIR} -A ${ASSETSDIR} -I ${CLASSPATH_ANDROID} -M ${MANIFEST} -S ${RESDIR}'
+	run_str = 'mkdir -p ${OUTRDIR} && ${AAPT} p -v -F ${TGT} -J ${OUTRDIR} -A ${ASSETSDIR} -I ${CLASSPATH_ANDROID} -M ${MANIFEST} -S ${RESDIR} -f'
 	vars = ['AAPT', 'OUTRDIR', 'ASSETSDIR', 'CLASSPATH_ANDROID', 'MANIFEST', 'RESDIR' ]
 
 	def runnable_status(self):
@@ -151,7 +151,7 @@ class aaptpackage(javaw.JTask):
 		if not self.inputs:
 			root   = self.generator.outdir.ctx.root
 			resdir = root.make_node(self.env.RESDIR)
-			self.inputs = resdir.ant_glob('**/*', quiet=True)
+			self.inputs = resdir.ant_glob('**/*', quiet=True) + [root.make_node(self.env.MANIFEST)]
 
 		return super(aaptpackage, self).runnable_status()