Skip to content

Commit dbd1d80

Browse files
Update Travis to NDK r11c.
1 parent 408db76 commit dbd1d80

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
@@ -1,24 +1,19 @@
11
#/bin/bash
22

3-
NDK_VER=android-ndk-r10d
3+
NDK_VER=android-ndk-r11c
44

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

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

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

2419
travis_before_install() {
@@ -61,7 +56,7 @@ travis_install() {
6156
if [ "$PPSSPP_BUILD_TYPE" = "Android" ]; then
6257
free -m
6358
sudo apt-get install ant -qq
64-
download_extract_xz http://hdkr.co/${NDK_VER}-x86_64.tar.xz ${NDK_VER}-x86_64.tar.xz
59+
download_extract_zip http://dl.google.com/android/repository/${NDK_VER}-linux-x86_64.zip ${NDK_VER}-linux-x86_64.zip
6560
fi
6661

6762
# Blackberry NDK: 10.3.0.440 + GCC: 4.8.2

0 commit comments

Comments
 (0)