vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

waf/android: prefer aapt, aapt2 has compatibility issues

Browse source
This commit is contained in:
mittorn 2020-07-07 07:21:01 +07:00
parent dea0c2ce43
commit b92b13158b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/waifulib/android.py
View file

@ -69,9 +69,9 @@ def configure(conf):
# optional # optional
try: try:
conf.find_program('aapt2', path_list = paths)
except Errors.ConfigurationError:
conf.find_program('aapt', path_list = paths) conf.find_program('aapt', path_list = paths)
except Errors.ConfigurationError:
conf.find_program('aapt2', path_list = paths)
# optional # optional
# if conf.env.BUILD_TOOLS_VERSION[0] >= D8_BUILD_TOOLS_MAJOR_VER: # if conf.env.BUILD_TOOLS_VERSION[0] >= D8_BUILD_TOOLS_MAJOR_VER:
@ -137,7 +137,7 @@ class aapt2link(javaw.JTask):
class aaptpackage(javaw.JTask): class aaptpackage(javaw.JTask):
color = 'GREEN' # androis green :) 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' ] vars = ['AAPT', 'OUTRDIR', 'ASSETSDIR', 'CLASSPATH_ANDROID', 'MANIFEST', 'RESDIR' ]
def runnable_status(self): def runnable_status(self):
@ -151,7 +151,7 @@ class aaptpackage(javaw.JTask):
if not self.inputs: if not self.inputs:
root = self.generator.outdir.ctx.root root = self.generator.outdir.ctx.root
resdir = root.make_node(self.env.RESDIR) 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() return super(aaptpackage, self).runnable_status()