[Libreoffice-commits] core.git: configure.ac

[brainbreaker]

 configure.ac |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 271882910107e177bc98af877f9c8b9f89c09795
Author: brainbreaker <gautamprajapati06 at gmail.com>
Date:   Thu Jun 22 23:42:48 2017 +0530

    android: update configure.ac to support building only with NDK>=15
    
    Change-Id: I638019895921082b9da36315c2f6d3ed98e5249a
    Reviewed-on: https://gerrit.libreoffice.org/39127
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/configure.ac b/configure.ac
index 0eb7ed7150a1..5d34221b7232 100644
--- a/configure.ac
+++ b/configure.ac
@@ -381,12 +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.*])
         ;;
-    11.1.*|12.1.*|13.1.*|14.1.*|15.0*)
+    11.1.*|12.1.*|13.1.*|14.1.*)
+        AC_MSG_ERROR([Bulding for Android is only supported with NDK versions above 15.0.*])
+        ;;
+    15.0.*)
         ;;
     *)
-        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."
+        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."
         ;;
     esac