From 128d60a6d3e65229fc324f7884f0d7151f0956aa Mon Sep 17 00:00:00 2001 From: Marcin Mielniczuk Date: Fri, 11 Aug 2017 17:28:54 +0200 Subject: [PATCH] Fall back to ANDROID_NDK if NDK not set (#3064) * Fall back to ANDROID_NDK if NDK not set --- kodev | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/kodev b/kodev index bc233844b..589251a7f 100755 --- a/kodev +++ b/kodev @@ -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