From 3b4c0c015b3a8cd9c25557ad40bac27dc698f995 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sun, 29 Dec 2013 10:03:51 +0800 Subject: [PATCH] bump version --- build-ndk.sh | 2 +- project/Build.scala | 4 ++-- src/main/jni/Application.mk | 4 ++-- src/main/res/values/arrays.xml | 1 + src/main/scala/com/github/shadowsocks/Shadowsocks.scala | 1 + 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build-ndk.sh b/build-ndk.sh index 11e61b44..a82b7a2f 100755 --- a/build-ndk.sh +++ b/build-ndk.sh @@ -6,6 +6,6 @@ mkdir -p assets/arm mkdir -p assets/x86 for app in iptables pdnsd redsocks shadowsocks tun2socks do - mv libs/armeabi/$app assets/arm/ + mv libs/armeabi-v7a/$app assets/arm/ mv libs/x86/$app assets/x86/ done diff --git a/project/Build.scala b/project/Build.scala index d54daf53..9874cdec 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -5,8 +5,8 @@ import sbtandroid._ import sbtandroid.AndroidPlugin._ object App { - val version = "2.0.6" - val versionCode = 57 + val version = "2.0.7" + val versionCode = 58 } object General { diff --git a/src/main/jni/Application.mk b/src/main/jni/Application.mk index bd947266..d7a293eb 100644 --- a/src/main/jni/Application.mk +++ b/src/main/jni/Application.mk @@ -1,4 +1,4 @@ -APP_ABI := armeabi x86 +APP_ABI := armeabi-v7a x86 APP_PLATFORM := android-9 APP_STL := stlport_static -NDK_TOOLCHAIN_VERSION := 4.6 +NDK_TOOLCHAIN_VERSION := 4.8 diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index 9f33d3f9..0f8b2a38 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -4789,6 +4789,7 @@ 68.169.0.0/16 68.178.0.0/16 68.180.0.0/16 + 68.232.0.0/16 68.233.0.0/16 68.234.0.0/16 69.10.0.0/16 diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala index f60cad78..5b622160 100644 --- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala +++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala @@ -392,6 +392,7 @@ class Shadowsocks sb.append("killall -9 shadowsocks").append("\n") sb.append("killall -9 tun2socks").append("\n") sb.append("rm /data/data/com.github.shadowsocks/pdnsd.conf").append("\n") + sb.append("rm /data/data/com.github.shadowsocks/pdnsd.cache").append("\n") Utils.runCommand(sb.toString()) sb.clear()