generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-12 10:33:52 +01:00
Code Issues Projects Releases Wiki Activity

Problem: Android CI NDK version out of date

Browse Source 
Solution: update CI scripts to use newer r11c from r10e
This commit is contained in:
Luca Boccassi 2016-06-07 23:18:49 +01:00
parent 8be568916e
commit b872e7d9f7
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builds/android/android_build_helper.sh
View File

@ -75,12 +75,12 @@ function android_build_env {
if [ -z "$ANDROID_NDK_ROOT" ]; then if [ -z "$ANDROID_NDK_ROOT" ]; then
ANDROID_BUILD_FAIL+=("Please set the ANDROID_NDK_ROOT environment variable") ANDROID_BUILD_FAIL+=("Please set the ANDROID_NDK_ROOT environment variable")
ANDROID_BUILD_FAIL+=(" (eg. \"/home/user/android/android-ndk-r9d\")") ANDROID_BUILD_FAIL+=(" (eg. \"/home/user/android/android-ndk-r11c\")")
fi fi
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-r9d/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.8/prebuilt/linux-x86_64/bin\")")
fi fi
if [ -z "$TOOLCHAIN_NAME" ]; then if [ -z "$TOOLCHAIN_NAME" ]; then

9
builds/android/ci_build.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
NDK_VER=android-ndk-r10e NDK_VER=android-ndk-r11c
NDK_ABI_VER=4.9 NDK_ABI_VER=4.9
if [ $TRAVIS_OS_NAME == "linux" ] if [ $TRAVIS_OS_NAME == "linux" ]
@ -14,12 +14,11 @@ else
exit 1 exit 1
fi fi
export FILENAME=$NDK_VER-$NDK_PLATFORM.bin export FILENAME=$NDK_VER-$NDK_PLATFORM.zip
(cd '/tmp' \ (cd '/tmp' \
&& wget http://dl.google.com/android/ndk/$FILENAME \ && wget http://dl.google.com/android/repository/$FILENAME \
&& chmod a+x $FILENAME \ && unzip $FILENAME &> /dev/null ) || exit 1
&& ./$FILENAME &> /dev/null ) || exit 1
unset FILENAME unset FILENAME
export ANDROID_NDK_ROOT="/tmp/$NDK_VER" export ANDROID_NDK_ROOT="/tmp/$NDK_VER"