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

brainbreaker gautamprajapati06 at gmail.com
Thu Jun 15 15:11:37 UTC 2017


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

New commits:
commit d628e193a93dfcd429e30a05baf9e730c44f768e
Author: brainbreaker <gautamprajapati06 at gmail.com>
Date:   Thu Jun 15 09:08:15 2017 +0530

    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 at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

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
 


More information about the Libreoffice-commits mailing list