mirror of
https://github.com/zeromq/libzmq.git
synced 2025-04-02 19:03:42 +00:00
Problem: Android CI script hardcodes ABI version
Solution: use a variable for easier maintenance, in sync with zproject
This commit is contained in:
parent
33ed569289
commit
8be568916e
@ -1,6 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
NDK_VER=android-ndk-r10e
|
||||
NDK_ABI_VER=4.9
|
||||
|
||||
if [ $TRAVIS_OS_NAME == "linux" ]
|
||||
then
|
||||
@ -22,8 +23,8 @@ export FILENAME=$NDK_VER-$NDK_PLATFORM.bin
|
||||
unset FILENAME
|
||||
|
||||
export ANDROID_NDK_ROOT="/tmp/$NDK_VER"
|
||||
export TOOLCHAIN_PATH="$ANDROID_NDK_ROOT/toolchains/arm-linux-androideabi-4.8/prebuilt/$NDK_PLATFORM/bin"
|
||||
export TOOLCHAIN_NAME="arm-linux-androideabi-4.8"
|
||||
export TOOLCHAIN_PATH="$ANDROID_NDK_ROOT/toolchains/arm-linux-androideabi-$NDK_ABI_VER/prebuilt/$NDK_PLATFORM/bin"
|
||||
export TOOLCHAIN_NAME="arm-linux-androideabi-$NDK_ABI_VER"
|
||||
export TOOLCHAIN_HOST="arm-linux-androideabi"
|
||||
export TOOLCHAIN_ARCH="arm"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user