Skip to content

Commit d053407

Browse files
Update Travis to NDK r11c.
1 parent 83deca5 commit d053407

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

.travis.sh

+4-9
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,20 @@
22

33
export USE_CCACHE=1
44
export NDK_CCACHE=ccache
5-
NDK_VER=android-ndk-r10d
5+
NDK_VER=android-ndk-r11c
66

77
download_extract() {
88
aria2c -x 16 $1 -o $2
99
tar -xf $2
1010
}
1111

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

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

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

6964
# Blackberry NDK: 10.3.0.440 + GCC: 4.8.2

0 commit comments

Comments
 (0)