From 64cc7e0827735705ef9c7cbe9fac07e20c269a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Fern=C3=A1ndez?= <paziusss@gmail.com>
Date: Mon, 1 Jul 2019 09:01:15 +0200
Subject: [PATCH] [Android] update ndk/sdk paths on demand, bump sdk tools..
 (#5103)

---
 base                             | 2 +-
 kodev                            | 4 ++--
 platform/android/luajit-launcher | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/base b/base
index 9135bfbe6..f07042f17 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit 9135bfbe6bd2f00969a721bd79c7c67100f975d5
+Subproject commit f07042f179127b73bc0a2d0b751fb1fdeadaac4f
diff --git a/kodev b/kodev
index 59025d6a9..578205880 100755
--- a/kodev
+++ b/kodev
@@ -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
diff --git a/platform/android/luajit-launcher b/platform/android/luajit-launcher
index cfe18e741..448efdf37 160000
--- a/platform/android/luajit-launcher
+++ b/platform/android/luajit-launcher
@@ -1 +1 @@
-Subproject commit cfe18e7415f0afabd4a59ad8f48b66efb68e4838
+Subproject commit 448efdf3743f9b2da13fc136d8855f995796063d