mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-08 03:56:24 +02:00
Update travis build to use ndk r10d.
Need to extract it from this archive because Google's is compressed too heavily and runs out of RAM extracting. Bonus: this one is smaller anyway (lzma2.) Thanks go to SonicAdvance1.
This commit is contained in:
1 parent
6936a03586
commit
1e757af645
1 file changed
+5
-3
+5
-3
@@ -31,8 +31,9 @@ matrix:
|
||||
before_install:
|
||||
- git submodule update --init --recursive
|
||||
- sudo apt-get update -qq
|
||||
- sudo apt-get install aria2 -qq
|
||||
- sudo apt-get install aria2 pv -qq
|
||||
- download_extract() { aria2c -x 16 $1 -o $2 && tar -xf $2; }
|
||||
- download_extract_xz() { aria2c -x 16 $1 -o $2 && pv $2 | xz -vd | tar -x; }
|
||||
# Travis uses CMake 2.8.7. We require 2.8.8. Grab latest
|
||||
- if [ "$CMAKE" == "TRUE" ]; then
|
||||
sudo apt-get install lib32stdc++6 lib32z1 lib32z1-dev -qq &&
|
||||
@@ -57,9 +58,10 @@ install:
|
||||
fi
|
||||
# Android NDK + GCC 4.8
|
||||
- if [ "$PPSSPP_BUILD_TYPE" == "Android" ]; then
|
||||
NDK_VER=android-ndk-r9d &&
|
||||
free -m &&
|
||||
NDK_VER=android-ndk-r10d &&
|
||||
sudo apt-get install ant -qq &&
|
||||
download_extract http://dl.google.com/android/ndk/${NDK_VER}-linux-x86_64.tar.bz2 ${NDK_VER}-linux-x86_64.tar.bz2 &&
|
||||
download_extract_xz http://hdkr.co/${NDK_VER}-x86_64.tar.xz ${NDK_VER}-linux-x86_64.tar.xz &&
|
||||
export ANDROID_HOME=$(pwd)/${NDK_VER} NDK=$(pwd)/${NDK_VER} &&
|
||||
if [[ "$CXX" == *clang* ]]; then export NDK_TOOLCHAIN_VERSION=clang; fi;
|
||||
fi
|
||||
|
||||
Reference in new issue
Block a user