diff options
| author | Gautam Prajapati <gautamprajapati06@gmail.com> | 2017-07-24 10:21:16 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-08-15 16:27:43 +0200 |
| commit | cad80f35f4944ebd23ea7818e7a3e9e825b55b28 (patch) | |
| tree | c01418f8e0c3e7a4e63ccf10ced59b5aaf9d4534 /configure.ac | |
| parent | 3281628e1cf66f51f414436cd2002e0a63ec4750 (diff) | |
Fix and enable NSS build for Android
Change-Id: Ifa8e01542ed0e7d72bfc9684f36b6dee9e185df4
Reviewed-on: https://gerrit.libreoffice.org/40645
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 490d03e058cd..4cd517015019 100644 --- a/configure.ac +++ b/configure.ac @@ -416,7 +416,8 @@ if test -n "$with_android_ndk"; then fi case "$with_android_ndk_toolchain_version" in clang5.0) - ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-4.9 + ANDROID_GCC_TOOLCHAIN_VERSION=4.9 + ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-$ANDROID_GCC_TOOLCHAIN_VERSION ANDROID_COMPILER_DIR=$ANDROID_NDK_HOME/toolchains/llvm ANDROID_USING_CLANG=true ;; @@ -449,8 +450,8 @@ if test -n "$with_android_ndk"; then AC_MSG_ERROR([We only support building for Android from Linux or OS X]) ;; esac - - ANDROID_COMPILER_BIN=$ANDROID_COMPILER_DIR/prebuilt/$ndk_build_os-x86/bin + ANDROID_CLANG_TOOLCHAIN=$ANDROID_COMPILER_DIR/prebuilt/$ndk_build_os-x86_64 + ANDROID_COMPILER_BIN=$ANDROID_CLANG_TOOLCHAIN/bin ANDROID_BINUTILS_PREBUILT_ROOT=$ANDROID_BINUTILS_DIR/prebuilt/$ndk_build_os-x86 if test $build_cpu = x86_64; then if test -d $ANDROID_COMPILER_DIR/prebuilt/$ndk_build_os-x86_64; then @@ -512,6 +513,8 @@ if test -n "$with_android_ndk"; then ANDROID_APP_ABI=x86 ANDROIDCFLAGS="-march=atom -gcc-toolchain $ANDROID_BINUTILS_PREBUILT_ROOT -target i686-none-linux-android" fi + + ANDROID_PLATFORM_DIRECTORY=$ANDROID_NDK_HOME/platforms/android-${ANDROID_API_LEVEL}/arch-${ANDROID_ARCH} ANDROIDCFLAGS="$ANDROIDCFLAGS -ffunction-sections -fdata-sections" ANDROIDCFLAGS="$ANDROIDCFLAGS -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}libs/$ANDROID_APP_ABI" ANDROIDCFLAGS="$ANDROIDCFLAGS --sysroot=$ANDROID_NDK_HOME/platforms/android-${ANDROID_API_LEVEL}/arch-${ANDROID_ARCH}" @@ -581,8 +584,12 @@ if test -n "$with_android_ndk"; then # remember to download the ownCloud Android library later BUILD_TYPE="$BUILD_TYPE OWNCLOUD_ANDROID_LIB" fi +AC_SUBST(ANDROID_NDK_HOME) AC_SUBST(ANDROID_NDK_GDBSERVER) AC_SUBST(ANDROID_APP_ABI) +AC_SUBST(ANDROID_CLANG_TOOLCHAIN) +AC_SUBST(ANDROID_GCC_TOOLCHAIN_VERSION) +AC_SUBST(ANDROID_PLATFORM_DIRECTORY) dnl =================================================================== dnl --with-android-sdk |