[Android] update ndk/sdk paths on demand, bump sdk tools.. (#5103)

This commit is contained in:
Martín Fernández
2019-07-01 09:01:15 +02:00
committed by Frans de Jonge
parent bcac5b845b
commit 64cc7e0827
3 changed files with 4 additions and 4 deletions

2
base

Submodule base updated: 9135bfbe6b...f07042f179

4
kodev
View File

@@ -202,9 +202,9 @@ ${SUPPORTED_TARGETS}"
;;
android)
if [ -z "${NDK}" ]; then
if [ -n "${ANDROID_NDK}" ]; then
if [ -n "${ANDROID_NDK_HOME}" ]; then
# some distributions use `ANDROID_NDK` instead, fall back to it
export NDK="${ANDROID_NDK}"
export NDK="${ANDROID_NDK_HOME}"
else
export NDK="${CURDIR}/base/toolchain/android-ndk-r15c"
fi