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

Tor Lillqvist tml at collabora.com
Fri Aug 1 00:18:39 PDT 2014


 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7e02666cbb84e4fc9045c7b019698b751adc2e64
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Aug 1 10:16:49 2014 +0300

    Accept NDK r10
    
    Also, don't bother accepting NDK r8* any longer.
    
    Change-Id: I87fa37a8bb4b00033fe9f81e8b9fc8b09af3b784

diff --git a/configure.ac b/configure.ac
index 5ef2401..fc99563 100644
--- a/configure.ac
+++ b/configure.ac
@@ -307,10 +307,10 @@ if test -n "$with_android_ndk"; then
     ANDROID_NDK_VERSION=`cut -f1 -d' ' <$ANDROID_NDK_HOME/RELEASE.TXT`
 
     case $ANDROID_NDK_VERSION in
-    r8*|r9*)
+    r9*|r10)
         ;;
     *)
-        AC_MSG_ERROR([Unsupported NDK version $ANDROID_NDK_VERSION, only r8* and r9* versions are supported])
+        AC_MSG_ERROR([Unsupported NDK version $ANDROID_NDK_VERSION, only r9* and r10 versions are supported])
         ;;
     esac
 


More information about the Libreoffice-commits mailing list