[Android] Update to NDK 15 (#3233)

Also improve SDK installation for ease of setting up development system. This also puts in place most of the missing pieces to finish the intent in #3064.
7 years ago · 4360837e3b
parent 80d8e44bde
commit 4360837e3b
3 changed files with 3 additions and 3 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 999741af6df4dbd0cfc81fa787ba960edf2313a7
+Subproject commit ba97174c9a73754ec6e7b7ee38d7ecddd7fce0cb
--- a/2
+++ b/2
@ -157,7 +157,7 @@ ${SUPPORTED_TARGETS}"
                    # some distributions use `ANDROID_NDK` instead, fall back to it
                    export NDK="${ANDROID_NDK}"
                else
-                    export NDK="${CURDIR}/base/toolchain/android-ndk-r12b"
+                    export NDK="${CURDIR}/base/toolchain/android-ndk-r15c"
                fi
            fi
            [ -e "${CURDIR}/base/toolchain/android-toolchain/bin/arm-linux-androideabi-gcc" ] || {
--- a/platform/android/luajit-launcher
+++ b/platform/android/luajit-launcher
@ -1 +1 @@
-Subproject commit 8f28ec98973335b0eea223183f05082f4eeda15d
+Subproject commit d690ee91433d7501497c4cb1306a459113c2f169