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

android: Remove GCC support for building

Browse Source 
Change-Id: Ia1b267ca3777a2a42c66d808322e03d631fac968
Reviewed-on: https://gerrit.libreoffice.org/39125
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
This commit is contained in:
brainbreaker 2017-06-22 23:06:58 +05:30 committed by Miklos Vajna
parent 68cf76917e
commit a4667cbbb9
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -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