From 57cb127d730873fd6df3a780b3ea55645c4586cc Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sat, 11 May 2019 18:58:22 +0300 Subject: [PATCH] waflib: android: use static version checks instead of try-catch, define which version has introduced d8 --- scripts/waflib/android.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/waflib/android.py b/scripts/waflib/android.py index 20777dd0..3ce8859f 100644 --- a/scripts/waflib/android.py +++ b/scripts/waflib/android.py @@ -7,7 +7,9 @@ from waflib import * from waflib.Tools import javaw 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): #grp = opt.add_option_group('Android options') @@ -56,9 +58,9 @@ def configure(conf): conf.find_program(i, path_list = paths) # optional - try: + if conf.env.BUILD_TOOLS_VERSION[0] >= D8_BUILD_TOOLS_MAJOR_VER: conf.find_program('d8', path_list = paths) - except: + else: conf.find_program('dx', path_list = paths)