From 04725803e4d891608f8c0fc0bcb71baa7506ddb9 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Fri, 24 Jul 2015 14:15:43 +0800 Subject: [PATCH] add android ipc feature --- src/main/jni/Android.mk | 7 ++++--- src/main/jni/shadowsocks-libev | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/jni/Android.mk b/src/main/jni/Android.mk index 13fa8e6e..d25693a3 100755 --- a/src/main/jni/Android.mk +++ b/src/main/jni/Android.mk @@ -249,13 +249,14 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) -SHADOWSOCKS_SOURCES := local.c cache.c udprelay.c encrypt.c utils.c netutils.c json.c jconf.c acl.c +SHADOWSOCKS_SOURCES := local.c cache.c udprelay.c encrypt.c utils.c netutils.c json.c jconf.c acl.c android.c LOCAL_MODULE := ss-local LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES)) LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL \ -DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H \ - -I$(LOCAL_PATH)/libev/ \ + -I$(LOCAL_PATH)/libev \ + -I$(LOCAL_PATH)/libancillary \ -I$(LOCAL_PATH)/openssl/include \ -I$(LOCAL_PATH)/shadowsocks-libev/libudns \ -I$(LOCAL_PATH)/shadowsocks-libev/libcork/include \ @@ -263,7 +264,7 @@ LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL \ -I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include/sodium \ -I$(LOCAL_PATH)/shadowsocks-libev/libipset/include -LOCAL_STATIC_LIBRARIES := libev libcrypto libipset libcork libudns libsodium +LOCAL_STATIC_LIBRARIES := libev libcrypto libipset libcork libudns libsodium libancillary LOCAL_LDLIBS := -llog diff --git a/src/main/jni/shadowsocks-libev b/src/main/jni/shadowsocks-libev index 2b1eef11..87fb6365 160000 --- a/src/main/jni/shadowsocks-libev +++ b/src/main/jni/shadowsocks-libev @@ -1 +1 @@ -Subproject commit 2b1eef11973de3f7380401fd20f937e84bc2b756 +Subproject commit 87fb63654515f22943f833f3e31c4e99a95424f2