mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow use of android ndk 11.1.x

Browse Source 
Change-Id: I1ae9419383c56a026d05d6adf4adf81dc981f56a
This commit is contained in:
Christian Lohmaier
2016-06-02 13:37:02 +02:00
parent 2cf09f0dcf
commit c58cd511ab
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@@ -349,15 +349,21 @@ if test -n "$with_android_ndk"; then
# Set up a lot of pre-canned defaults # Set up a lot of pre-canned defaults
if test ! -f $ANDROID_NDK_HOME/RELEASE.TXT; then 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 fi
ANDROID_NDK_VERSION=`cut -f1 -d' ' <$ANDROID_NDK_HOME/RELEASE.TXT`
case $ANDROID_NDK_VERSION in case $ANDROID_NDK_VERSION in
r9*|r10*) 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 esac