From 8d163c98708a425b9b3d4c58b52a63f6fb2575b8 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Sat, 22 Feb 2014 11:01:02 +0800
Subject: [PATCH] update shadowsocks to 1.4.3

---
 src/main/jni/Android.mk  | 11 ++++++-----
 src/main/jni/shadowsocks |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/jni/Android.mk b/src/main/jni/Android.mk
index 19aec910..0e23bf66 100755
--- a/src/main/jni/Android.mk
+++ b/src/main/jni/Android.mk
@@ -94,13 +94,14 @@ include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
 
-SHADOWSOCKS_SOURCES := local.c encrypt.c utils.c json.c jconf.c
+SHADOWSOCKS_SOURCES := local.c cache.c udprelay.c encrypt.c utils.c json.c jconf.c
 
 LOCAL_MODULE    := shadowsocks 
 LOCAL_SRC_FILES := $(addprefix shadowsocks/src/, $(SHADOWSOCKS_SOURCES))
-LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DANDROID -DHAVE_CONFIG_H \
-	-I$(LOCAL_PATH)/libev/ \
-	-I$(LOCAL_PATH)/openssl/include 
+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 
 
 LOCAL_STATIC_LIBRARIES := libev libcrypto
 
@@ -244,4 +245,4 @@ iptables_subdirs := $(addprefix $(LOCAL_PATH)/iptables/,$(addsuffix /Android.mk,
 include $(iptables_subdirs)
 
 # Import cpufeatures
-$(call import-module,android/cpufeatures)
\ No newline at end of file
+$(call import-module,android/cpufeatures)
diff --git a/src/main/jni/shadowsocks b/src/main/jni/shadowsocks
index 458eb25a..7063d1fa 160000
--- a/src/main/jni/shadowsocks
+++ b/src/main/jni/shadowsocks
@@ -1 +1 @@
-Subproject commit 458eb25a04e30e60a707ebd61f85be0038ef9254
+Subproject commit 7063d1fa6fe5a0c03d4204c113826bd4ad3a752d