diff --git a/builds/android/android_build_helper.sh b/builds/android/android_build_helper.sh index a5e4eb50..5745561d 100644 --- a/builds/android/android_build_helper.sh +++ b/builds/android/android_build_helper.sh @@ -75,12 +75,12 @@ function android_build_env { if [ -z "$ANDROID_NDK_ROOT" ]; then 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 if [ -z "$TOOLCHAIN_PATH" ]; then 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 if [ -z "$TOOLCHAIN_NAME" ]; then diff --git a/builds/android/ci_build.sh b/builds/android/ci_build.sh index 76beb844..83ce6c54 100755 --- a/builds/android/ci_build.sh +++ b/builds/android/ci_build.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -NDK_VER=android-ndk-r10e +NDK_VER=android-ndk-r11c NDK_ABI_VER=4.9 if [ $TRAVIS_OS_NAME == "linux" ] @@ -14,12 +14,11 @@ else exit 1 fi -export FILENAME=$NDK_VER-$NDK_PLATFORM.bin +export FILENAME=$NDK_VER-$NDK_PLATFORM.zip (cd '/tmp' \ - && wget http://dl.google.com/android/ndk/$FILENAME \ - && chmod a+x $FILENAME \ - && ./$FILENAME &> /dev/null ) || exit 1 + && wget http://dl.google.com/android/repository/$FILENAME \ + && unzip $FILENAME &> /dev/null ) || exit 1 unset FILENAME export ANDROID_NDK_ROOT="/tmp/$NDK_VER"