Commit 31a5cff9 authored by Max Lv's avatar Max Lv

refine #100

parent 4e22d26e
...@@ -16,8 +16,8 @@ do ...@@ -16,8 +16,8 @@ do
mv libs/armeabi-v7a/$app src/main/assets/armeabi-v7a/ mv libs/armeabi-v7a/$app src/main/assets/armeabi-v7a/
mv libs/x86/$app src/main/assets/x86/ mv libs/x86/$app src/main/assets/x86/
done done
rm -rf src/main/jni rm -rf src/main/libs
mv libs src/main/jni mv libs src/main/
# Target 16 # Target 16
cp jni/Application.mk.16 jni/Application.mk cp jni/Application.mk.16 jni/Application.mk
......
...@@ -183,22 +183,22 @@ include $(BUILD_SHARED_LIBRARY) ...@@ -183,22 +183,22 @@ include $(BUILD_SHARED_LIBRARY)
## shadowsocks tunnel ## shadowsocks tunnel
######################################################## ########################################################
include $(CLEAR_VARS) # include $(CLEAR_VARS)
#
SHADOWSOCKS_SOURCES := tunnel.c cache.c udprelay.c encrypt.c utils.c json.c jconf.c # SHADOWSOCKS_SOURCES := tunnel.c cache.c udprelay.c encrypt.c utils.c json.c jconf.c
#
LOCAL_MODULE := ss-tunnel # LOCAL_MODULE := ss-tunnel
LOCAL_SRC_FILES := $(addprefix shadowsocks/src/, $(SHADOWSOCKS_SOURCES)) # LOCAL_SRC_FILES := $(addprefix shadowsocks/src/, $(SHADOWSOCKS_SOURCES))
LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL -DUDPRELAY_TUNNEL \ # LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL -DUDPRELAY_TUNNEL \
-DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H \ # -DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H \
-I$(LOCAL_PATH)/libev/ \ # -I$(LOCAL_PATH)/libev/ \
-I$(LOCAL_PATH)/openssl/include # -I$(LOCAL_PATH)/openssl/include
#
LOCAL_STATIC_LIBRARIES := libev libcrypto # LOCAL_STATIC_LIBRARIES := libev libcrypto
#
LOCAL_LDLIBS := -llog # LOCAL_LDLIBS := -llog
#
include $(BUILD_EXECUTABLE) # include $(BUILD_EXECUTABLE)
######################################################## ########################################################
## shadowsocks tunnel library ## shadowsocks tunnel library
......
resolvers += Resolver.url("scalasbt releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-snapshots"))(Resolver.ivyStylePatterns) resolvers += Resolver.url("scalasbt releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-snapshots"))(Resolver.ivyStylePatterns)
addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.2.16") addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.3.3")
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0") addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
...@@ -310,9 +310,12 @@ class ShadowsocksNatService extends Service with BaseService { ...@@ -310,9 +310,12 @@ class ShadowsocksNatService extends Service with BaseService {
} }
override def onStartCommand(intent: Intent, flags: Int, startId: Int): Int = { override def onStartCommand(intent: Intent, flags: Int, startId: Int): Int = {
Service.START_NOT_STICKY Service.START_STICKY
} }
override def onTaskRemoved(intent: Intent) {
stopRunner()
}
def killProcesses() { def killProcesses() {
Console.runRootCommand(Utils.getIptables + " -t nat -F OUTPUT") Console.runRootCommand(Utils.getIptables + " -t nat -F OUTPUT")
......
...@@ -256,7 +256,11 @@ class ShadowsocksVpnService extends VpnService with BaseService { ...@@ -256,7 +256,11 @@ class ShadowsocksVpnService extends VpnService with BaseService {
} }
override def onStartCommand(intent: Intent, flags: Int, startId: Int): Int = { override def onStartCommand(intent: Intent, flags: Int, startId: Int): Int = {
Service.START_NOT_STICKY Service.START_STICKY
}
override def onTaskRemoved(intent: Intent) {
stopRunner()
} }
override def onRevoke() { override def onRevoke() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment