Skip to content

Commit

Permalink
Update Travis to NDK r11c.
Browse files Browse the repository at this point in the history
  • Loading branch information
unknownbrackets committed May 21, 2016
1 parent 83deca5 commit d053407
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions .travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,20 @@

export USE_CCACHE=1
export NDK_CCACHE=ccache
NDK_VER=android-ndk-r10d
NDK_VER=android-ndk-r11c

download_extract() {
aria2c -x 16 $1 -o $2
tar -xf $2
}

# This is used for the Android NDK.
download_extract_xz() {
download_extract_zip() {
aria2c --file-allocation=none --timeout=120 --retry-wait=5 --max-tries=20 -Z -c $1 -o $2
stat -c 'ATTEMPT 1 - %s' $2
md5sum $2
# This resumes the download, in case it failed.
aria2c --file-allocation=none --timeout=120 --retry-wait=5 --max-tries=20 -Z -c $1 -o $2
stat -c 'ATTEMPT 2 - %s' $2
md5sum $2

# Keep some output going during the extract, so the build doesn't timeout.
pv $2 | xz -vd | tar -x
unzip $2 2>&1 | pv > /dev/null
}

travis_before_install() {
Expand Down Expand Up @@ -63,7 +58,7 @@ travis_install() {
if [ "$PPSSPP_BUILD_TYPE" = "Android" ]; then
free -m
sudo apt-get install ant -qq
download_extract_xz http://hdkr.co/${NDK_VER}-x86_64.tar.xz ${NDK_VER}-x86_64.tar.xz
download_extract_zip http://dl.google.com/android/repository/${NDK_VER}-linux-x86_64.zip ${NDK_VER}-linux-x86_64.zip
fi

# Blackberry NDK: 10.3.0.440 + GCC: 4.8.2
Expand Down

0 comments on commit d053407

Please sign in to comment.