merge latest shadowsocks-libev changes

This commit is contained in:
Max Lv
2013-04-19 18:29:31 +08:00
parent 3d0fb53b42
commit 4d9b448b70
5 changed files with 8 additions and 2 deletions
+3
View File
@@ -0,0 +1,3 @@
[submodule "jni/shadowsocks"]
path = jni/shadowsocks
url = https://github.com/madeye/shadowsocks-libev.git
Binary file not shown.
Binary file not shown.
+4 -2
View File
@@ -110,9 +110,11 @@ include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
SHADOWSOCKS_SOURCES := local.c encrypt.c rc4.c md5.c utils.c json.c jconf.c
LOCAL_MODULE := shadowsocks
LOCAL_SRC_FILES := shadowsocks/local.c shadowsocks/encrypt.c shadowsocks/rc4.c shadowsocks/md5.c
LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -I$(LOCAL_PATH)/libev/
LOCAL_SRC_FILES := $(addprefix shadowsocks/src/, $(SHADOWSOCKS_SOURCES))
LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -I$(LOCAL_PATH)/libev/ -DHAVE_CONFIG_H -DANDROID
LOCAL_STATIC_LIBRARIES := libev
+1
Submodule jni/shadowsocks added at 3ed7551ce1