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

waflib: android: use static version checks instead of try-catch, define which version has introduced d8

Browse source
This commit is contained in:
Alibek Omarov 2019-05-11 18:58:22 +03:00
parent af9a759e9a
commit 57cb127d73
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/waflib/android.py
View file

@ -7,7 +7,9 @@ from waflib import *
from waflib.Tools import javaw from waflib.Tools import javaw
android_sdk_home_env = ['ANDROID_SDK_HOME', 'ANDROID_SDK'] android_sdk_home_env = ['ANDROID_SDK_HOME', 'ANDROID_SDK']
have_aapt2 = False
# d8 started to roll out in 28
D8_BUILD_TOOLS_MAJOR_VER = 28
def options(opt): def options(opt):
#grp = opt.add_option_group('Android options') #grp = opt.add_option_group('Android options')
@ -56,9 +58,9 @@ def configure(conf):
conf.find_program(i, path_list = paths) conf.find_program(i, path_list = paths)
# optional # optional
try: if conf.env.BUILD_TOOLS_VERSION[0] >= D8_BUILD_TOOLS_MAJOR_VER:
conf.find_program('d8', path_list = paths) conf.find_program('d8', path_list = paths)
except: else:
conf.find_program('dx', path_list = paths) conf.find_program('dx', path_list = paths)