diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2023-01-25 10:45:29 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2023-02-16 20:32:46 +0000 |
| commit | 7e4ffea3187534326232588860e335989602e90b (patch) | |
| tree | 512b98625dc1ea86675af26c270a1d1b7b67860e /config_host.mk.in | |
| parent | d07962c0b1395aa5edf21ba2ddbbc0574bf464b7 (diff) | |
android: Use libc++_shared path that works for NDK 25, too
While e.g. NDK 23.0.7599858 has both,
`$HOME/Android/Sdk/ndk/23.0.7599858/sources/cxx-stl/llvm-libc++/libs/x86/libc++_shared.so`
and
`$HOME/Android/Sdk/ndk/23.0.7599858/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/libc++_shared.so`
(with the same content), NDK 25.1.8937393 no longer
ships that under the former path scheme, just the latter.
Therefore, use that one when copying the library,
in preparation to add support for NDK 24 and 25.
Change-Id: I20894701f4f436f41781467b57ec4f5311a8317f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146133
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index b400827a2ce9..847e5af06a46 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -19,7 +19,9 @@ export ANDROID_NDK_DIR=@ANDROID_NDK_DIR@ export ANDROID_API_LEVEL=@ANDROID_API_LEVEL@ export ANDROID_APP_ABI=@ANDROID_APP_ABI@ export ANDROID_SDK_DIR=@ANDROID_SDK_DIR@ +export ANDROID_SYSROOT_PLATFORM=@ANDROID_SYSROOT_PLATFORM@ export ANDROID_PACKAGE_NAME=@ANDROID_PACKAGE_NAME@ +export ANDROID_TOOLCHAIN=@ANDROID_TOOLCHAIN@ export ANDROID_GCC_TOOLCHAIN_VERSION=@ANDROID_GCC_TOOLCHAIN_VERSION@ export ANT=@ANT@ export ANT_HOME=@ANT_HOME@ |