Skip to content

L
libzmq
Commit b4abaad2 authored by Luca Boccassi's avatar Luca Boccassi
Browse files
Options

Problem: Android CI uses outdated C++ ABI 4.8 

Solution: switch to 4.9
parent b872e7d9
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
builds/android/android_build_helper.sh
View file @ b4abaad2
...@@ -80,12 +80,12 @@ function android_build_env { ...@@ -80,12 +80,12 @@ function android_build_env {
if [ -z "$TOOLCHAIN_PATH" ]; then if [ -z "$TOOLCHAIN_PATH" ]; then
ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_PATH environment variable") ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_PATH environment variable")
ANDROID_BUILD_FAIL+=(" (eg. \"/home/user/android/android-ndk-r11c/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin\")") ANDROID_BUILD_FAIL+=(" (eg. \"/home/user/android/android-ndk-r11c/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin\")")
fi fi
if [ -z "$TOOLCHAIN_NAME" ]; then if [ -z "$TOOLCHAIN_NAME" ]; then
ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_NAME environment variable") ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_NAME environment variable")
ANDROID_BUILD_FAIL+=(" (eg. \"arm-linux-androideabi-4.8\")") ANDROID_BUILD_FAIL+=(" (eg. \"arm-linux-androideabi-4.9\")")
fi fi
if [ -z "$TOOLCHAIN_HOST" ]; then if [ -z "$TOOLCHAIN_HOST" ]; then
...@@ -210,21 +210,21 @@ function _android_build_opts_process_cxx_stl { ...@@ -210,21 +210,21 @@ function _android_build_opts_process_cxx_stl {
;; ;;
esac esac
;; ;;
gnustl_shared_48) gnustl_shared_49)
LIBS+=" -lgnustl_shared" LIBS+=" -lgnustl_shared"
CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/include" CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/include"
case "${TOOLCHAIN_ARCH}" in case "${TOOLCHAIN_ARCH}" in
arm) arm)
LDFLAGS+=" -L${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi" LDFLAGS+=" -L${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi"
CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi/include" CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include"
;; ;;
x86) x86)
LDFLAGS+=" -L${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86" LDFLAGS+=" -L${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86"
CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86/include" CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include"
;; ;;
mips) mips)
LDFLAGS+=" -L${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/libs/mips" LDFLAGS+=" -L${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips"
CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/libs/mips/include" CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/include"
;; ;;
*) *)
ANDROID_BUILD_FAIL+=("Unknown combination for ANDROID_BUILD_CXXSTL and TOOLCHAIN_ARCH") ANDROID_BUILD_FAIL+=("Unknown combination for ANDROID_BUILD_CXXSTL and TOOLCHAIN_ARCH")
......
builds/android/build.sh
View file @ b4abaad2
...@@ -8,7 +8,7 @@ ANDROID_BUILD_DIR="$(pwd)" ...@@ -8,7 +8,7 @@ ANDROID_BUILD_DIR="$(pwd)"
source ${ANDROID_BUILD_DIR}/android_build_helper.sh source ${ANDROID_BUILD_DIR}/android_build_helper.sh
# Choose a C++ standard library implementation from the ndk # Choose a C++ standard library implementation from the ndk
ANDROID_BUILD_CXXSTL="gnustl_shared_48" ANDROID_BUILD_CXXSTL="gnustl_shared_49"
# Set up android build environment and set ANDROID_BUILD_OPTS array # Set up android build environment and set ANDROID_BUILD_OPTS array
android_build_env android_build_env
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment