strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

demote "unknown android ndk" to warning only (and add 13.1 as known)

Browse source 
android studio/sdk manager doesn't provide a default way to install
multiple versions of the NDK, so typically only the latest one will be
available. Don't make configure error out in this case, but print a
warning instead.

Change-Id: I6af9a3f088daf7d12ebd9910286d7f44d264014a
This commit is contained in:
Christian Lohmaier 2016-11-10 11:52:55 +01:00
parent 61f760d2c4
commit 3e522fcbaa
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configure.ac
View file

@ -361,14 +361,17 @@ if test -n "$with_android_ndk"; then
else
ANDROID_NDK_VERSION=`cut -f1 -d' ' <$ANDROID_NDK_HOME/RELEASE.TXT`
fi
if test -z "$ANDROID_NDK_VERSION"; then
AC_MSG_ERROR([Failed to determine android NDK version. Please check your installation.])
fi
case $ANDROID_NDK_VERSION in
r9*|r10*)
;;
11.1.*|12.1.*)
11.1.*|12.1.*|13.1.*)
;;
*)
AC_MSG_ERROR([Unsupported NDK version $ANDROID_NDK_VERSION, only r9*, r10*, 11.1.* and 12.1.* are supported])
AC_MSG_WARN([Untested android NDK version $ANDROID_NDK_VERSION, only versions r9* til 13.1.* have been used successfully. Proceed at your own risk.])
add_warning "Untested android NDK version $ANDROID_NDK_VERSION, only versions r9* til 13.1.* have been used successfully. Proceed at your own risk."
;;
esac