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

[Christian Lohmaier]

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

New commits:
commit c58cd511ab6c280a72ed725dbca653d3b1274f2a
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Thu Jun 2 13:37:02 2016 +0200

    allow use of android ndk 11.1.x
    
    Change-Id: I1ae9419383c56a026d05d6adf4adf81dc981f56a

diff --git a/configure.ac b/configure.ac
index db1b0ae..8bdee1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -349,15 +349,21 @@ if test -n "$with_android_ndk"; then
     # Set up a lot of pre-canned defaults
 
     if test ! -f $ANDROID_NDK_HOME/RELEASE.TXT; then
-        AC_MSG_ERROR([Unrecognized Android NDK. Missing RELEASE.TXT file in $ANDROID_NDK_HOME.])
+        if test ! -f $ANDROID_NDK_HOME/source.properties; then
+            AC_MSG_ERROR([Unrecognized Android NDK. Missing RELEASE.TXT or source.properties file in $ANDROID_NDK_HOME.])
+        fi
+        ANDROID_NDK_VERSION=`sed -n -e 's/Pkg.Revision = //p' $ANDROID_NDK_HOME/source.properties`
+    else
+        ANDROID_NDK_VERSION=`cut -f1 -d' ' <$ANDROID_NDK_HOME/RELEASE.TXT`
     fi
-    ANDROID_NDK_VERSION=`cut -f1 -d' ' <$ANDROID_NDK_HOME/RELEASE.TXT`
 
     case $ANDROID_NDK_VERSION in
     r9*|r10*)
         ;;
+    11.1.*)
+        ;;
     *)
-        AC_MSG_ERROR([Unsupported NDK version $ANDROID_NDK_VERSION, only r9* and r10* versions are supported])
+        AC_MSG_ERROR([Unsupported NDK version $ANDROID_NDK_VERSION, only r9*, r10* and 11.1.* versions are supported])
         ;;
     esac