configure.ac | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
New commits:
commit b91d9e2d9138b2eb09629d0a2d7e63869f5b9f1b
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Thu Jun 2 18:14:39 2016 +0200
android: gnu-libstdc++ dir is versioned in ndk-bundle
even with only one toolchain, so test whether path exists without
version, otherwise just stick it in.
Change-Id: I58c7f9e9582efdccb446e1bcf161d2c9e913a3af
diff --git a/configure.ac b/configure.ac
index 8bdee1d..442a816 100644
--- a/configure.ac
+++ b/configure.ac
@@ -443,16 +443,14 @@ if test -n "$with_android_ndk"; then
# This stays empty if there is just one version of the toolchain in the NDK
ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR=
- case "`echo $ANDROID_NDK_HOME/toolchains/$android_cpu*-*/prebuilt/*/bin`"
in
- */bin\ */bin*)
- # Trailing slash intentional and necessary, compare to how this is used
+ if test ! -d "$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs" ; then
+ # nope, won't work if empty...
+ # as is the case when using the ndk-bundle as installed with android
studio
+
ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR="${with_android_ndk_toolchain_version}/"
if test -n "$ANDROID_USING_CLANG"; then
ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR=4.8/
- else
-
ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR="${with_android_ndk_toolchain_version}/"
fi
- ;;
- esac
+ fi
ANDROID_API_LEVEL=15
if test $host_cpu = arm; then
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
