summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrainbreaker <gautamprajapati06@gmail.com>2017-06-22 23:06:58 +0530
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-07-13 13:47:50 +0200
commita4667cbbb9b490323ddf58a24e6223ffefb5611b (patch)
tree7df7999bb5887fdb12ab6d3d71864c7f8a56ed5d
parent68cf76917e342aa5f47deb7e3ef3f7706f8f5a5a (diff)
android: Remove GCC support for building
Change-Id: Ia1b267ca3777a2a42c66d808322e03d631fac968 Reviewed-on: https://gerrit.libreoffice.org/39125 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--configure.ac8
1 files changed, 2 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index eca31bf115ea..6344d6ebf56d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -416,17 +416,13 @@ if test -n "$with_android_ndk"; then
fi
case "$with_android_ndk_toolchain_version" in
- 4.6|4.7|4.8|4.9)
- ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-$with_android_ndk_toolchain_version
- ANDROID_COMPILER_DIR=$ANDROID_BINUTILS_DIR
- ;;
- clang3.3|clang3.4|clang5.0)
+ clang5.0)
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-4.9
ANDROID_COMPILER_DIR=$ANDROID_NDK_HOME/toolchains/llvm
ANDROID_USING_CLANG=true
;;
*)
- AC_MSG_ERROR([Unrecognized value for the --with-android-ndk-toolchain-version option])
+ AC_MSG_ERROR([Unrecognized value for the --with-android-ndk-toolchain-version option. Building for Android is only supported with Clang 5.*])
esac
if test ! -d $ANDROID_BINUTILS_DIR; then