summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--android/Bootstrap/Makefile.shared1
-rw-r--r--config_host.mk.in1
-rw-r--r--configure.ac1
3 files changed, 3 insertions, 0 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 0cd5ec6fcbda..b93735234b3d 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -108,6 +108,7 @@ liboSettings.gradle: $(BUILDDIR)/config_build.mk $(BUILDDIR)/config_host.mk \
&& echo "}" \
&& echo "android {" \
&& echo " ndkPath '$(ANDROID_NDK_DIR)'" \
+ && echo " ndkVersion '$(ANDROID_NDK_VERSION)'" \
&& echo "}" \
&& echo "android.defaultConfig {" \
&& echo " applicationId '$(ANDROID_PACKAGE_NAME)'" \
diff --git a/config_host.mk.in b/config_host.mk.in
index fe1fb546a6d1..e303f5945d99 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -16,6 +16,7 @@ export BUILDDIR=@BUILDDIR@
export ABW_CFLAGS=$(gb_SPACE)@ABW_CFLAGS@
export ABW_LIBS=$(gb_SPACE)@ABW_LIBS@
export ANDROID_NDK_DIR=@ANDROID_NDK_DIR@
+export ANDROID_NDK_VERSION=@ANDROID_NDK_VERSION@
export ANDROID_API_LEVEL=@ANDROID_API_LEVEL@
export ANDROID_APP_ABI=@ANDROID_APP_ABI@
export ANDROID_SDK_DIR=@ANDROID_SDK_DIR@
diff --git a/configure.ac b/configure.ac
index 815900fc21ea..fbd6196921a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -847,6 +847,7 @@ if test -n "$with_android_ndk"; then
fi
fi
AC_SUBST(ANDROID_NDK_DIR)
+AC_SUBST(ANDROID_NDK_VERSION)
AC_SUBST(ANDROID_API_LEVEL)
AC_SUBST(ANDROID_APP_ABI)
AC_SUBST(ANDROID_GCC_TOOLCHAIN_VERSION)