From a4667cbbb9b490323ddf58a24e6223ffefb5611b Mon Sep 17 00:00:00 2001 From: brainbreaker Date: Thu, 22 Jun 2017 23:06:58 +0530 Subject: [PATCH] android: Remove GCC support for building Change-Id: Ia1b267ca3777a2a42c66d808322e03d631fac968 Reviewed-on: https://gerrit.libreoffice.org/39125 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- configure.ac | 8 ++------ 1 file 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