diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-06-02 18:14:39 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-06-02 18:14:39 +0200 |
| commit | b91d9e2d9138b2eb09629d0a2d7e63869f5b9f1b (patch) | |
| tree | dbb83a2bd94458cad15c8945eb56e88a936d7233 | |
| parent | 66c41718f91dcca9c487742e9313c657ede4ce3f (diff) | |
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
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 8bdee1d3820d..442a8169ebaf 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 |