From 1c7ca95b1a82c6e4ac3aa34793609913fb9a4034 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Tue, 10 Nov 2015 09:53:49 +0800 Subject: [PATCH] update setup scripts --- .travis.yml | 2 +- travis-ci/setup.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 990dc0b7..d5bf3fe2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ before_cache: - find $HOME/.sbt -name "*.lock" | xargs rm - - find $HOME/.ivy2/ -name "*.lock" | xargs rm + - find $HOME/.ivy2 -name "*.lock" | xargs rm cache: directories: diff --git a/travis-ci/setup.sh b/travis-ci/setup.sh index 5117e95b..300e6d2b 100755 --- a/travis-ci/setup.sh +++ b/travis-ci/setup.sh @@ -14,12 +14,16 @@ if [ ! -d "$ANDROID_HOME" ] pushd $HOME/.android wget -q http://dl.google.com/android/android-sdk_r24.3.4-linux.tgz tar xf android-sdk_r24.3.4-linux.tgz + popd fi if [ ! -d "$ANDROID_NDK_HOME" ] + mkdir -p $ANDROID_NDK_HOME + pushd $HOME/.android wget -q http://dl.google.com/android/ndk/android-ndk-r10d-linux-${ARCH}.bin chmod +x android-ndk-r10d-linux-${ARCH}.bin ./android-ndk-r10d-linux-${ARCH}.bin -y &> /dev/null + popd fi echo "y" | android update sdk --filter tools,platform-tools,build-tools-23.0.1,android-23,extra-google-m2repository