From f8088cd4351690853f70b70717d319fe7156e927 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sun, 3 Jul 2016 18:37:09 +0800 Subject: [PATCH] Update android ndk --- .travis.yml | 2 +- travis-ci/setup.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1198e145..491ac25e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ install: - ./travis-ci/setup.sh - export NDK_CCACHE=ccache - export ARCH=`uname -m` - - export ANDROID_NDK_HOME=$HOME/.android/android-ndk-r12 + - export ANDROID_NDK_HOME=$HOME/.android/android-ndk-r12b - export ANDROID_HOME=$HOME/.android/android-sdk-linux - export PATH=${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${PATH} - cp local.properties.travis local.properties diff --git a/travis-ci/setup.sh b/travis-ci/setup.sh index 63a5d5bb..7511641d 100755 --- a/travis-ci/setup.sh +++ b/travis-ci/setup.sh @@ -1,7 +1,7 @@ #!/bin/bash export ARCH=`uname -m` -export ANDROID_NDK_HOME=$HOME/.android/android-ndk-r12 +export ANDROID_NDK_HOME=$HOME/.android/android-ndk-r12b export ANDROID_HOME=$HOME/.android/android-sdk-linux export PATH=${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${PATH} @@ -16,8 +16,8 @@ fi if [ ! -d "$ANDROID_NDK_HOME" ]; then mkdir -p $ANDROID_NDK_HOME pushd $HOME/.android - wget -q http://dl.google.com/android/repository/android-ndk-r12-linux-${ARCH}.zip - unzip -q android-ndk-r12-linux-${ARCH}.zip + wget -q http://dl.google.com/android/repository/android-ndk-r12b-linux-${ARCH}.zip + unzip -q android-ndk-r12b-linux-${ARCH}.zip popd fi