diff --git a/.gitmodules b/.gitmodules index e69de29b..2a787436 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src/main/jni/shadowsocks-libev"] + path = src/main/jni/shadowsocks-libev + url = https://github.com/shadowsocks/shadowsocks-libev diff --git a/src/main/jni/Android.mk b/src/main/jni/Android.mk index 71f68d24..3907cf7a 100755 --- a/src/main/jni/Android.mk +++ b/src/main/jni/Android.mk @@ -61,8 +61,8 @@ SODIUM_SOURCE := $(crypto_aead_src) $(crypto_auth_src) $(crypto_box_src) \ $(crypto_stream_src) $(crypto_verify_src) $(randombytes_src) $(sodium_src) LOCAL_MODULE := sodium -LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks/libsodium/src/libsodium/include \ - -I$(LOCAL_PATH)/shadowsocks/libsodium/src/libsodium/include/sodium \ +LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include \ + -I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include/sodium \ -DPACKAGE_NAME=\"libsodium\" -DPACKAGE_TARNAME=\"libsodium\" \ -DPACKAGE_VERSION=\"1.0.1\" -DPACKAGE_STRING=\"libsodium\ 1.0.1\" \ -DPACKAGE_BUGREPORT=\"https://github.com/jedisct1/libsodium/issues\" \ @@ -79,7 +79,7 @@ LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks/libsodium/src/libsodium/include -DHAVE_WEAK_SYMBOLS=1 -DHAVE_ARC4RANDOM=1 -DHAVE_ARC4RANDOM_BUF=1 \ -DHAVE_MLOCK=1 -DHAVE_MPROTECT=1 -DHAVE_POSIX_MEMALIGN=1 -LOCAL_SRC_FILES := $(addprefix shadowsocks/libsodium/src/libsodium/,$(SODIUM_SOURCE)) +LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/libsodium/src/libsodium/,$(SODIUM_SOURCE)) include $(BUILD_STATIC_LIBRARY) @@ -126,10 +126,10 @@ set_src = set/allocation.c set/inspection.c set/ipv4_set.c set/ipv6_set.c \ IPSET_SOURCE := general.c $(bdd_src) $(map_src) $(set_src) LOCAL_MODULE := libipset -LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks/libipset/include \ - -I$(LOCAL_PATH)/shadowsocks/libcork/include +LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks-libev/libipset/include \ + -I$(LOCAL_PATH)/shadowsocks-libev/libcork/include -LOCAL_SRC_FILES := $(addprefix shadowsocks/libipset/,$(IPSET_SOURCE)) +LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/libipset/,$(IPSET_SOURCE)) include $(BUILD_STATIC_LIBRARY) @@ -153,10 +153,10 @@ pthreads_src := pthreads/thread.c CORK_SOURCE := $(cli_src) $(core_src) $(ds_src) $(posix_src) $(pthreads_src) LOCAL_MODULE := libcork -LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks/libcork/include \ +LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks-libev/libcork/include \ -DCORK_API=CORK_LOCAL -LOCAL_SRC_FILES := $(addprefix shadowsocks/libcork/,$(CORK_SOURCE)) +LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/libcork/,$(CORK_SOURCE)) include $(BUILD_STATIC_LIBRARY) @@ -210,7 +210,7 @@ LOCAL_CFLAGS := -Wall -O2 -I$(LOCAL_PATH)/pdnsd include $(BUILD_EXECUTABLE) ######################################################## -## shadowsocks local library +## shadowsocks-libev local library ######################################################## include $(CLEAR_VARS) @@ -218,15 +218,15 @@ include $(CLEAR_VARS) SHADOWSOCKS_SOURCES := local.c cache.c udprelay.c encrypt.c utils.c json.c jconf.c acl.c LOCAL_MODULE := ss-local -LOCAL_SRC_FILES := $(addprefix shadowsocks/src/, $(SHADOWSOCKS_SOURCES)) +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)/openssl/include \ - -I$(LOCAL_PATH)/shadowsocks/libcork/include \ - -I$(LOCAL_PATH)/shadowsocks/libsodium/src/libsodium/include \ - -I$(LOCAL_PATH)/shadowsocks/libsodium/src/libsodium/include/sodium \ - -I$(LOCAL_PATH)/shadowsocks/libipset/include + -I$(LOCAL_PATH)/shadowsocks-libev/libcork/include \ + -I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include \ + -I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include/sodium \ + -I$(LOCAL_PATH)/shadowsocks-libev/libipset/include LOCAL_STATIC_LIBRARIES := libev libcrypto libipset libcork libsodium @@ -235,7 +235,7 @@ LOCAL_LDLIBS := -llog include $(BUILD_EXECUTABLE) ######################################################## -## shadowsocks tunnel +## shadowsocks-libev tunnel ######################################################## include $(CLEAR_VARS) @@ -243,12 +243,12 @@ include $(CLEAR_VARS) SHADOWSOCKS_SOURCES := tunnel.c cache.c udprelay.c encrypt.c utils.c json.c jconf.c LOCAL_MODULE := ss-tunnel -LOCAL_SRC_FILES := $(addprefix shadowsocks/src/, $(SHADOWSOCKS_SOURCES)) +LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES)) LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL -DUDPRELAY_TUNNEL \ -DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H -DSSTUNNEL_JNI \ -I$(LOCAL_PATH)/libev/ \ - -I$(LOCAL_PATH)/shadowsocks/libsodium/src/libsodium/include \ - -I$(LOCAL_PATH)/shadowsocks/libsodium/src/libsodium/include/sodium \ + -I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include \ + -I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include/sodium \ -I$(LOCAL_PATH)/openssl/include LOCAL_STATIC_LIBRARIES := libev libcrypto libsodium diff --git a/src/main/jni/shadowsocks-libev b/src/main/jni/shadowsocks-libev new file mode 160000 index 00000000..a772aba1 --- /dev/null +++ b/src/main/jni/shadowsocks-libev @@ -0,0 +1 @@ +Subproject commit a772aba1f481e7bd39b70ebbe9db737155f6ca12