configure.ac | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit c57631351c2acf9fd47050ec6e73a09dcc7d95bd
Author: brainbreaker <gautamprajapat...@gmail.com>
Date: Mon Jul 10 23:41:21 2017 +0530
android:Update configure.ac to support NDK 15.1.x
Change-Id: I07ec4df7cb5aaf4b491fac1202d2607af9f56968
Reviewed-on: https://gerrit.libreoffice.org/39780
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/configure.ac b/configure.ac
index 6344d6ebf56d..119cdea487ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -381,16 +381,16 @@ if test -n "$with_android_ndk"; then
fi
case $ANDROID_NDK_VERSION in
r9*|r10*)
- AC_MSG_ERROR([Bulding for Android is only supported with NDK versions
above 15.0.*])
+ AC_MSG_ERROR([Bulding for Android is only supported with NDK versions
above 15.x*])
;;
11.1.*|12.1.*|13.1.*|14.1.*)
- AC_MSG_ERROR([Bulding for Android is only supported with NDK versions
above 15.0.*])
+ AC_MSG_ERROR([Bulding for Android is only supported with NDK versions
above 15.x.*])
;;
- 15.0.*)
+ 15.0.*|15.1.*)
;;
*)
- AC_MSG_WARN([Untested android NDK version $ANDROID_NDK_VERSION, only
version 15.0.* have been used successfully. Proceed at your own risk.])
- add_warning "Untested android NDK version $ANDROID_NDK_VERSION, only
version 15.0.* have been used successfully. Proceed at your own risk."
+ AC_MSG_WARN([Untested android NDK version $ANDROID_NDK_VERSION, only
version 15.0.* and 15.1.* have been used successfully. Proceed at your own
risk.])
+ add_warning "Untested android NDK version $ANDROID_NDK_VERSION, only
version 15.0.* and 15.1.* have been used successfully. Proceed at your own
risk."
;;
esac
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
