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

pull/5105/head
Martín Fernández 5 years ago committed by Frans de Jonge
parent bcac5b845b
commit 64cc7e0827

@ -1 +1 @@
Subproject commit 9135bfbe6bd2f00969a721bd79c7c67100f975d5
Subproject commit f07042f179127b73bc0a2d0b751fb1fdeadaac4f

@ -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

@ -1 +1 @@
Subproject commit cfe18e7415f0afabd4a59ad8f48b66efb68e4838
Subproject commit 448efdf3743f9b2da13fc136d8855f995796063d
Loading…
Cancel
Save