Alawn/shadowsocks-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:shadowsocks/shadowsocks-android

Browse Source
This commit is contained in:
Mygod
2016-07-01 13:27:40 +08:00
parent 0b3ee8b793 42460904ee
commit f787e795cc
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+5 -1
View File
@@ -27,7 +27,7 @@ cache:
- $HOME/.ivy2/cache
- $HOME/.sbt/boot
before_install:
install:
- ./travis-ci/setup.sh
- export NDK_CCACHE=ccache
- export ARCH=`uname -m`
@@ -36,5 +36,9 @@ before_install:
- export PATH=${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${PATH}
- cp local.properties.travis local.properties
before_script:
- echo $JAVA_OPTS
- export JAVA_OPTS="-Xmx2048m $JAVA_OPTS"
script:
- sbt native-build android:package-release
travis-ci/setup.sh
+1 -1
View File
@@ -22,5 +22,5 @@ if [ ! -d "$ANDROID_NDK_HOME" ]; then
popd
fi
( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --filter tools,platform-tools,build-tools-23.0.2,android-23,extra-google-m2repository --no-ui -a
( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --filter tools,platform-tools,build-tools-24.0.0,android-23,android-24,extra-google-m2repository --no-ui -a
( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --filter extra-android-m2repository --no-ui -a