3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-27 15:41:05 +08:00
Code Issues Projects Releases Wiki Activity

Revert "Problem: Libs crash at runtime on Android when built with NDK 23+"

Browse Source 
This reverts commit 9c6f09cbe551e08782b67fae367b56dc69f656f7.
This commit is contained in:
Benjamin Deroche 2022-05-10 15:21:06 +02:00
parent 9c6f09cbe5
commit 5f6f708f29
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builds/android/android_build_helper.sh
View File

@ -97,17 +97,11 @@ function android_build_set_env {
export TOOLCHAIN_ARCH="x86_64" export TOOLCHAIN_ARCH="x86_64"
fi fi
# Since NDK r23 LLVM is the default
if [ -x "${TOOLCHAIN_PATH}/${TOOLCHAIN_HOST}-ar" ]; then
# Choose a C++ standard library implementation from the ndk
ANDROID_BUILD_CXXSTL="gnustl_shared_49"
fi
# Since NDK r22 the "platforms" dir got removed # Since NDK r22 the "platforms" dir got removed
if [ -d "${ANDROID_NDK_ROOT}/platforms" ]; then if [ -d "${ANDROID_NDK_ROOT}/platforms" ]; then
export ANDROID_BUILD_SYSROOT="${ANDROID_NDK_ROOT}/platforms/android-${MIN_SDK_VERSION}/arch-${TOOLCHAIN_ARCH}" export ANDROID_BUILD_SYSROOT="${ANDROID_NDK_ROOT}/platforms/android-${MIN_SDK_VERSION}/arch-${TOOLCHAIN_ARCH}"
else else
export ANDROID_BUILD_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${HOST_PLATFORM}/sysroot" export ANDROID_BUILD_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${HOST_PLATFORM}/sysroot"
fi fi
export ANDROID_BUILD_PREFIX="${ANDROID_BUILD_DIR}/prefix/${TOOLCHAIN_ARCH}" export ANDROID_BUILD_PREFIX="${ANDROID_BUILD_DIR}/prefix/${TOOLCHAIN_ARCH}"
} }

3
builds/android/build.sh
View File

@ -11,6 +11,9 @@ ANDROID_BUILD_DIR="${ANDROID_BUILD_DIR:-`pwd`}"
# Get access to android_build functions and variables # Get access to android_build functions and variables
source ./android_build_helper.sh source ./android_build_helper.sh
# Choose a C++ standard library implementation from the ndk
ANDROID_BUILD_CXXSTL="gnustl_shared_49"
BUILD_ARCH=$1 BUILD_ARCH=$1
if [ -z $BUILD_ARCH ]; then if [ -z $BUILD_ARCH ]; then
usage usage