Fix a bug

update shadowsocks-libev
refine DNS resolver on Lollipop
2014-11-13 18:04:19 +08:00 · 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
1181 changed files with 609 additions and 1818 deletions
@@ -3,24 +3,21 @@ 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-linux.tgz
- tar xf android-sdk_r23-linux.tgz
+- 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-20.0.0,android-19,extra-google-m2repository --no-ui --no-https -a
+- echo "y" | android update sdk --filter tools,platform-tools,build-tools-21.0.1,android-21,extra-google-m2repository --no-ui --no-https -a
 - echo "y" | android update sdk --filter extra-android-m2repository --no-ui --no-https -a
 script:
 - ./build-ndk.sh
 - cp local.properties.travis local.properties
 - sbt android:package-release
+- exit 0
@@ -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
@@ -1,38 +1,28 @@
 #!/bin/bash

-# Target 9
-cp jni/Application.mk.9 jni/Application.mk
-ndk-build clean
-ndk-build
-rm -rf src/main/assets/armeabi
+function try () {
+    "$@" || exit -1
+}
+
+# Build
+try $ANDROID_NDK_HOME/ndk-build clean
+try $ANDROID_NDK_HOME/ndk-build
+
+# copy executables
 rm -rf src/main/assets/armeabi-v7a
 rm -rf src/main/assets/x86
-mkdir -p src/main/assets/armeabi
 mkdir -p src/main/assets/armeabi-v7a
 mkdir -p src/main/assets/x86
-for app in pdnsd redsocks
+for app in pdnsd redsocks iptables
 do
-    mv libs/armeabi/$app src/main/assets/armeabi/
-    mv libs/armeabi-v7a/$app src/main/assets/armeabi-v7a/
-    mv libs/x86/$app src/main/assets/x86/
-done
-rm -rf src/main/jni
-mv libs src/main/jni
-
-# Target 16
-cp jni/Application.mk.16 jni/Application.mk
-ndk-build clean
-ndk-build
-rm -rf src/main/assets/api-16/armeabi
-rm -rf src/main/assets/api-16/armeabi-v7a
-rm -rf src/main/assets/api-16/x86
-mkdir -p src/main/assets/api-16/armeabi
-mkdir -p src/main/assets/api-16/armeabi-v7a
-mkdir -p src/main/assets/api-16/x86
-for app in pdnsd redsocks
-do
-    mv libs/armeabi/$app src/main/assets/api-16/armeabi/
-    mv libs/armeabi-v7a/$app src/main/assets/api-16/armeabi-v7a/
-    mv libs/x86/$app src/main/assets/api-16/x86/
+    try mv libs/armeabi-v7a/$app src/main/assets/armeabi-v7a/
+    try mv libs/x86/$app src/main/assets/x86/
 done

+# copy libraries
+rm -rf src/main/jni/armeabi-v7a
+rm -rf src/main/jni/x86
+mkdir -p src/main/jni/armeabi-v7a
+mkdir -p src/main/jni/x86
+try mv libs/armeabi-v7a/*.so src/main/jni/armeabi-v7a/
+try mv libs/x86/*.so src/main/jni/x86/
@@ -4,7 +4,7 @@ import android.Dependencies.{apklib,aar}

 android.Plugin.androidBuild

-platformTarget in Android := "android-19"
+platformTarget in Android := "android-21"

 name := "shadowsocks"

@@ -15,7 +15,6 @@ resolvers += "JRAF" at "http://JRAF.org/static/maven/2"
 resolvers += "madeye private releases" at "http://madeye-maven-repository.googlecode.com/git/"

 libraryDependencies ++= Seq(
-  "com.google.android" % "analytics" % "3.01",
  "dnsjava" % "dnsjava" % "2.1.5",
  "org.scalaj" %% "scalaj-http" % "0.3.10",
  "commons-net" % "commons-net" % "3.3",
@@ -23,15 +22,13 @@ libraryDependencies ++= Seq(
 )

 libraryDependencies ++= Seq(
-  aar("com.actionbarsherlock" % "actionbarsherlock" % "4.4.0") exclude("com.google.android", "support-v4"),
  "net.simonvt.menudrawer" % "menudrawer" % "3.0.6",
-  "org.jraf" % "android-switch-backport" % "1.3.1",
-  "com.google.android.gms" % "play-services" % "4.4.52",
+  "com.google.android.gms" % "play-services" % "5.0.89",
  "com.android.support" % "support-v4" % "19.1.0"
 )

 libraryDependencies ++= Seq(
-  "de.keyboardsurfer.android.widget" % "crouton" % "1.8.1" exclude("com.google.android", "support-v4"),
+  "de.keyboardsurfer.android.widget" % "crouton" % "1.8.4" exclude("com.google.android", "support-v4"),
  "com.nostra13.universalimageloader" % "universal-image-loader" % "1.8.4",
  "com.j256.ormlite" % "ormlite-core" % "4.47",
  "com.j256.ormlite" % "ormlite-android" % "4.47"
@@ -335,13 +335,13 @@ openssl_subdirs := $(addprefix $(LOCAL_PATH)/openssl/,$(addsuffix /Android.mk, \
 include $(openssl_subdirs)

 # Iptables
-# LOCAL_PATH := $(ROOT_PATH)
-# iptables_subdirs := $(addprefix $(LOCAL_PATH)/iptables/,$(addsuffix /Android.mk, \
-# 	iptables \
-# 	extensions \
-# 	libiptc \
-# 	))
-# include $(iptables_subdirs)
+LOCAL_PATH := $(ROOT_PATH)
+iptables_subdirs := $(addprefix $(LOCAL_PATH)/iptables/,$(addsuffix /Android.mk, \
+	iptables \
+	extensions \
+	libiptc \
+	))
+include $(iptables_subdirs)

 # Import cpufeatures
 $(call import-module,android/cpufeatures)
@@ -0,0 +1,4 @@
+APP_ABI      			:= armeabi-v7a x86
+APP_PLATFORM 			:= android-16
+APP_STL      			:= stlport_static
+NDK_TOOLCHAIN_VERSION 	:= 4.9
@@ -1,4 +0,0 @@
-APP_ABI      			:= armeabi armeabi-v7a x86
-APP_PLATFORM 			:= android-16
-APP_STL      			:= stlport_static
-NDK_TOOLCHAIN_VERSION 	:= 4.8
@@ -1,4 +0,0 @@
-APP_ABI      			:= armeabi armeabi-v7a x86
-APP_PLATFORM 			:= android-9
-APP_STL      			:= stlport_static
-NDK_TOOLCHAIN_VERSION 	:= 4.8
@@ -21,11 +21,11 @@ jstring Java_com_github_shadowsocks_system_getabi(JNIEnv *env, jobject thiz) {
  } else if (family == ANDROID_CPU_FAMILY_MIPS) {
    abi = "mips";
  } else if (family == ANDROID_CPU_FAMILY_ARM) {
-    if (features & ANDROID_CPU_ARM_FEATURE_ARMv7) {
-      abi = "armeabi-v7a";
-    } else {
-      abi = "armeabi";
-    }
+    // if (features & ANDROID_CPU_ARM_FEATURE_ARMv7) {
+    abi = "armeabi-v7a";
+    // } else {
+    //   abi = "armeabi";
+    // }
  }
  return env->NewStringUTF(abi);
 }
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.github.shadowsocks"
-    android:versionCode="69"
-    android:versionName="2.2.1">
+    android:versionCode="78"
+    android:versionName="2.3.3">

  <uses-permission android:name="android.permission.INTERNET"/>
  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -15,10 +15,11 @@
      android:required="false"/>

  <uses-sdk
-      android:minSdkVersion="9"
-      android:targetSdkVersion="19"/>
+      android:minSdkVersion="16"
+      android:targetSdkVersion="21"/>

  <application
+      android:allowBackup="true"
      android:name=".ShadowsocksApplication"
      android:hardwareAccelerated="true"
      android:icon="@drawable/ic_launcher"
@@ -75,14 +76,12 @@

    <service
        android:name=".ShadowsocksNatService"
-        android:process=":proxy"
        android:exported="false">
    </service>

    <service
        android:name=".ShadowsocksVpnService"
        android:label="@string/app_name"
-        android:process=":vpn"
        android:permission="android.permission.BIND_VPN_SERVICE"
        android:exported="false">
      <intent-filter>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Max Lv	4b99f8e3d6	Fix a bug	2014-11-13 18:04:19 +08:00
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
Max Lv	f6841848a3	chnroute works perfectly without root on lollipop	2014-10-21 20:37:04 +08:00
Max Lv	52cb15069c	update travis	2014-10-21 12:28:40 +08:00
Max Lv	70ed2189b1	add iptables back	2014-10-21 12:06:12 +08:00
Max Lv	aeee9c2fac	fix an issue for autostart	2014-10-19 20:38:16 +08:00
Max Lv	70dc8e9995	bypass IPv6 instead	2014-10-19 19:47:59 +08:00
Max Lv	558a39ec14	refine per-app VPN	2014-10-19 18:33:04 +08:00
Max Lv	5f95cccce4	implement per-app VPN for Android 5.0	2014-10-19 18:23:27 +08:00
Max Lv	55f25d3272	disable NAT mode on lollipop for now	2014-10-19 14:09:27 +08:00
Max Lv	93273cbc44	fix an issue on lollipop	2014-10-19 13:58:19 +08:00
Max Lv	c0514ee169	disable bypass feature of pdnsd	2014-10-18 10:46:54 +08:00
Max Lv	06d736b22d	fix all issues for lollipop	2014-10-18 09:58:40 +08:00
Max Lv	e34d5675eb	update shadowsocks-libev	2014-10-14 12:58:09 +08:00
Max Lv	94c7ffb788	remove large icon	2014-09-30 12:59:15 +08:00
Max Lv	0647ef4c6d	fix #121	2014-09-19 14:17:45 +08:00
Max Lv	97c6ff95cd	fix an issue in the build scripts	2014-09-18 08:24:39 +08:00
Max Lv	971ef22186	fix a data race	2014-09-15 12:52:29 +08:00
Max Lv	c35a92a927	fix a crash	2014-09-14 15:39:03 +08:00
Max Lv	c05a63a75b	fix #116	2014-09-13 17:18:25 +08:00
Max Lv	6074a99eb6	fix an issue	2014-09-11 20:55:57 +08:00
Max Lv	e52719d1be	back to old play services	2014-09-09 21:58:34 +08:00
Max Lv	cfaaaf5341	update with new cipher rc4-md5	2014-09-09 21:28:19 +08:00
Max Lv	4a4d3b11fb	refine handler	2014-09-07 11:44:06 +08:00
Max Lv	3538caa80d	update styles	2014-09-07 11:00:12 +08:00
Max Lv	ae30c218e9	drop support of Android 2.3	2014-09-07 10:06:22 +08:00
Max Lv	86e93ffa2d	try to fix #114	2014-09-04 16:51:37 +08:00