Fall back to ANDROID_NDK if NDK not set (#3064)

* Fall back to ANDROID_NDK if NDK not set
7 years ago · 128d60a6d3
parent 8073a1d12f
commit 128d60a6d3
1 changed files with 8 additions and 1 deletions
--- a/9
+++ b/9
@ -94,7 +94,14 @@ ${SUPPORTED_TARGETS}"
            assert_ret_zero $?
            ;;
        android)
-            [[ -n ${NDK+x} ]] || export NDK="${CURDIR}/base/toolchain/android-ndk-r12b"
+            if [ -z "${NDK+x}" ]; then
+                if [ -n "${ANDROID_NDK+x}" ]; then
+                    # some distributions use `ANDROID_NDK` instead, fall back to it
+                    export NDK="${ANDROID_NDK}"
+                else
+                    export NDK="${CURDIR}/base/toolchain/android-ndk-r12b"
+                fi
+            fi
            [ -e "${CURDIR}/base/toolchain/android-toolchain/bin/arm-linux-androideabi-gcc" ] || {
                { [ -e "${NDK}" ] || make -C "${CURDIR}/base/toolchain" android-ndk; }
                make android-toolchain