update shadowsocks-libev

refine DNS resolver on Lollipop
remove traffic stat
2014-11-11 18:00:38 +08:00 · 2014-11-05 15:52:57 +08:00 · 2014-10-31 12:39:24 +08:00 · 2014-10-30 12:28:52 +08:00 · 2014-10-28 13:19:05 +08:00 · 2014-10-27 20:43:14 +08:00
1107 changed files with 39 additions and 1194 deletions
@@ -3,19 +3,15 @@ scala:
 - 2.10.4
 before_install:
 - sudo apt-get update
- sudo apt-get install libc6-dev-i386
- sudo apt-get install lib32ncurses5-dev
- sudo apt-get install libx11-dev
- sudo apt-get install g++-multilib
- sudo apt-get install lib32z1-dev
- sudo apt-get install ccache
+install:
+- sudo apt-get install -y libc6-dev-i386 lib32ncurses5-dev libx11-dev g++-multilib lib32z1-dev ccache
 - export NDK_CCACHE=ccache
 - export ARCH=`uname -m`
 - wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz
 - tar xf android-sdk_r23.0.2-linux.tgz
 - wget http://dl.google.com/android/ndk/android-ndk-r9d-linux-${ARCH}.tar.bz2
 - tar xf android-ndk-r9d-linux-${ARCH}.tar.bz2
- export ANDROID_NDK=`pwd`/android-ndk-r9d
+- export ANDROID_NDK_HOME=`pwd`/android-ndk-r9d
 - export ANDROID_HOME=`pwd`/android-sdk-linux
 - export PATH=${PATH}:${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
 - echo "y" | android update sdk --filter tools,platform-tools,build-tools-21.0.1,android-21,extra-google-m2repository --no-ui --no-https -a
@@ -39,7 +39,7 @@ Help to translate shadowsocks: http://crowdin.net/project/shadowsocks/invite
 #### BUILD on Mac OS X (with HomeBrew)

 * Install Android SDK and NDK by run `brew install android-ndk android-sdk`
-* Add `export ANDROID_HOME=/usr/local/Cellar/android-sdk/$version` to your .bashrc , then reopen the shell to loat it.
+* Add `export ANDROID_HOME=/usr/local/Cellar/android-sdk/$version` to your .bashrc , then reopen the shell to load it.
 * Run `echo "y" | android update sdk --filter tools,platform-tools,build-tools-19.0.3,android-19,extra-google-m2repository,extra-android-m2repository --no-ui --no-https -a`
 * Create your key following the instructions at http://developer.android.com/guide/publishing/app-signing.html#cert
 * Put your key in ~/.keystore
@@ -5,8 +5,8 @@ function try () {
 }

 # Build
-try ndk-build clean
-try ndk-build
+try $ANDROID_NDK_HOME/ndk-build clean
+try $ANDROID_NDK_HOME/ndk-build

 # copy executables
 rm -rf src/main/assets/armeabi-v7a
@@ -1,4 +1,4 @@
 APP_ABI      			:= armeabi-v7a x86
 APP_PLATFORM 			:= android-16
 APP_STL      			:= stlport_static
-NDK_TOOLCHAIN_VERSION 	:= 4.8
+NDK_TOOLCHAIN_VERSION 	:= 4.9
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.github.shadowsocks"
-    android:versionCode="76"
-    android:versionName="2.3.1">
+    android:versionCode="77"
+    android:versionName="2.3.2">

  <uses-permission android:name="android.permission.INTERNET"/>
  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Max Lv	475cfe3269	update shadowsocks-libev	2014-11-11 18:00:38 +08:00
Max Lv	102387077f	refine DNS resolver on Lollipop	2014-11-05 15:52:57 +08:00
Max Lv	72824eb8f4	remove traffic stat	2014-10-31 12:39:24 +08:00
Max Lv	1f40be1ad3	update some strings	2014-10-30 12:28:52 +08:00
Max Lv	c12ec62d8b	update shadowsocks-libev	2014-10-28 13:19:05 +08:00
Max Lv	e38ed2d069	bump version	2014-10-27 20:43:14 +08:00
Max Lv	2e05e3cda8	bypass private ipv4 addresses	2014-10-27 20:17:42 +08:00
Max Lv	92ffb357a6	Merge pull request #134 from zhaofengli/master Fix NDK build	2014-10-26 13:44:29 +08:00
Zhaofeng Li	4beff01a3f	.travis.yml: Minor clean-up	2014-10-26 13:03:14 +08:00
Zhaofeng Li	7627952234	README.md: Fix typo [ci skip]	2014-10-26 12:55:37 +08:00
Zhaofeng Li	425d4a42e8	.travis.yml: Fix typo ANDROID_NDK -> ANDROID_NDK_HOME	2014-10-26 12:31:02 +08:00
Zhaofeng Li	194d978143	build-ndk.sh: Don't assume NDK is in $PATH	2014-10-26 12:29:48 +08:00