YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-17 18:40:02 +00:00
Code Issues Projects Releases Wiki Activity

waflib: xcompile: add support for ANDROID_NDK environment variable, as well as ANDROID_NDK_HOME. Fix help message.

Browse Source
This commit is contained in:
Alibek Omarov 2019-04-27 13:00:52 +03:00
parent bd6532fae4
commit d4b4a4a864
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/waflib/xcompile.py
View File

@ -112,13 +112,17 @@ class Android:
def options(opt): def options(opt):
android = opt.add_option_group('Android options') android = opt.add_option_group('Android options')
android.add_option('--android', action='store', dest='ANDROID_OPTS', default=None, android.add_option('--android', action='store', dest='ANDROID_OPTS', default=None,
help='enable building for android, format: --android=<arch>,<toolchain>,<api>, example: --android=arm,4.9,26') help='enable building for android, format: --android=<arch>,<toolchain>,<api>, example: --android=armeabi-v7a-hard,4.9,9')
def configure(conf): def configure(conf):
if conf.options.ANDROID_OPTS: if conf.options.ANDROID_OPTS:
android_ndk_path = os.getenv('ANDROID_NDK_HOME') for i in ['ANDROID_NDK_HOME', 'ANDROID_NDK']:
android_ndk_path = os.getenv(i)
if android_ndk_path != None:
break
if not android_ndk_path: if not android_ndk_path:
conf.fatal('Set ANDROID_NDK_HOME environment variable pointing to the root of Android NDK!') conf.fatal('Set ANDROID_NDK_HOME environment variable pointing to the root of Android NDK!')
values = conf.options.ANDROID_OPTS.split(',') values = conf.options.ANDROID_OPTS.split(',')
if len(values) != 3: if len(values) != 3: