From e3cf54f7035c2cee8c521b61e4bb8940b71ee284 Mon Sep 17 00:00:00 2001 From: Mygod Date: Mon, 16 Jan 2017 09:22:31 +0800 Subject: [PATCH] Update shadowsocks-libev --- mobile/src/main/jni/Android.mk | 4 ++-- mobile/src/main/jni/Application.mk | 2 +- mobile/src/main/jni/shadowsocks-libev | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mobile/src/main/jni/Android.mk b/mobile/src/main/jni/Android.mk index ac13a962..9e3c51cc 100755 --- a/mobile/src/main/jni/Android.mk +++ b/mobile/src/main/jni/Android.mk @@ -387,7 +387,7 @@ include $(CLEAR_VARS) SHADOWSOCKS_SOURCES := local.c cache.c udprelay.c encrypt.c \ utils.c netutils.c json.c jconf.c acl.c http.c tls.c rule.c \ - obfs_http.c obfs_tls.c base64.c \ + plugin.c \ android.c LOCAL_MODULE := ss-local @@ -420,7 +420,7 @@ include $(BUILD_SHARED_EXECUTABLE) include $(CLEAR_VARS) -SHADOWSOCKS_SOURCES := tunnel.c cache.c udprelay.c encrypt.c utils.c netutils.c json.c jconf.c android.c obfs_http.c obfs_tls.c base64.c +SHADOWSOCKS_SOURCES := tunnel.c cache.c udprelay.c encrypt.c utils.c netutils.c json.c jconf.c android.c plugin.c LOCAL_MODULE := ss-tunnel LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES)) diff --git a/mobile/src/main/jni/Application.mk b/mobile/src/main/jni/Application.mk index 8ea8eb37..e32dd558 100644 --- a/mobile/src/main/jni/Application.mk +++ b/mobile/src/main/jni/Application.mk @@ -1,4 +1,4 @@ APP_ABI := armeabi-v7a x86 -APP_PLATFORM := android-16 +APP_PLATFORM := android-19 APP_STL := stlport_static NDK_TOOLCHAIN_VERSION := clang diff --git a/mobile/src/main/jni/shadowsocks-libev b/mobile/src/main/jni/shadowsocks-libev index 3b4af24f..45529cdf 160000 --- a/mobile/src/main/jni/shadowsocks-libev +++ b/mobile/src/main/jni/shadowsocks-libev @@ -1 +1 @@ -Subproject commit 3b4af24fecae932abe02830321af6f6cb54f72e2 +Subproject commit 45529cdf7a3cd5384d58f97ec0e4c62de55cdae0