summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrainbreaker <gautamprajapati06@gmail.com>2017-06-15 09:08:15 +0530
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-06-15 17:11:10 +0200
commitd628e193a93dfcd429e30a05baf9e730c44f768e (patch)
treecbb26bc77854d095b2e818213bef1a6e60873cdc
parent336ec28195da1917c22494a24dbaf10b846d3141 (diff)
android: Bump NDK version to 15 in configure.ac
This commits updates the NDK version warning in confiure.ac for NDK r15 as it is now tested for building Android. Change-Id: I6b138ce36e246ae035cf994808d17be3b4d47112 Reviewed-on: https://gerrit.libreoffice.org/38811 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--configure.ac6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index d3d1542ba99e..e82c61d86424 100644
--- a/configure.ac
+++ b/configure.ac
@@ -382,11 +382,11 @@ if test -n "$with_android_ndk"; then
case $ANDROID_NDK_VERSION in
r9*|r10*)
;;
- 11.1.*|12.1.*|13.1.*|14.1.*)
+ 11.1.*|12.1.*|13.1.*|14.1.*|15.0*)
;;
*)
- AC_MSG_WARN([Untested android NDK version $ANDROID_NDK_VERSION, only versions r9* til 14.1.* have been used successfully. Proceed at your own risk.])
- add_warning "Untested android NDK version $ANDROID_NDK_VERSION, only versions r9* til 14.1.* have been used successfully. Proceed at your own risk."
+ AC_MSG_WARN([Untested android NDK version $ANDROID_NDK_VERSION, only versions r9* til 15.0.* have been used successfully. Proceed at your own risk.])
+ add_warning "Untested android NDK version $ANDROID_NDK_VERSION, only versions r9* til 15.0.* have been used successfully. Proceed at your own risk."
;;
esac