aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2019-07-04 06:31:50 -0400
committerJack Lloyd <[email protected]>2019-07-04 06:31:50 -0400
commitde278af21cfd2f7a09b47d084e592761a13cba6f (patch)
tree3498b427ac63ab3893a9c03b4f55f2752d853e2c /src
parent18406954f201fd9d098b0dd299b006b500a72da0 (diff)
Cleanups
Diffstat (limited to 'src')
-rwxr-xr-xsrc/scripts/ci_build.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py
index 83f26941e..76a50a8c9 100755
--- a/src/scripts/ci_build.py
+++ b/src/scripts/ci_build.py
@@ -145,16 +145,14 @@ def determine_flags(target, target_os, target_cpu, target_cc, cc_bin, ccache, ro
raise Exception("Unknown cross target '%s' for iOS" % (target))
elif target_os == 'android':
- if os.getenv('ANDROID_NDK') is None:
+ ndk = os.getenv('ANDROID_NDK')
+ if ndk is None:
raise Exception('Android CI build requires ANDROID_NDK env variable be set')
- if os.getenv('ANDROID_API_LEVEL') is None:
+ api_lvl = int(os.getenv('ANDROID_API_LEVEL', '0'))
+ if api_lvl == 0:
# If not set arbitrarily choose API 16 (Android 4.1) for ARMv7 and 28 (Android 9) for AArch64
api_lvl = 16 if target == 'cross-android-arm32' else 28
- else:
- api_lvl = int(os.getenv('ANDROID_API_LEVEL'))
-
- ndk = os.getenv('ANDROID_NDK')
toolchain_dir = os.path.join(ndk, 'toolchains/llvm/prebuilt/linux-x86_64/bin')
test_cmd = None