From c00731326840cdc4e1c9a538cf73688104014a93 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Thu, 14 Sep 2017 19:21:43 -0700
Subject: [PATCH] Update shadowsocks-libev

---
 .gitmodules                           |  3 ---
 mobile/src/main/jni/Android.mk        | 29 ++++-----------------------
 mobile/src/main/jni/libudns           |  1 -
 mobile/src/main/jni/shadowsocks-libev |  2 +-
 4 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 160000 mobile/src/main/jni/libudns

diff --git a/.gitmodules b/.gitmodules
index 092ed998..09136bb1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -30,9 +30,6 @@
 [submodule "mobile/src/main/jni/libev"]
 	path = mobile/src/main/jni/libev
 	url = https://github.com/shadowsocks/libev.git
-[submodule "mobile/src/main/jni/libudns"]
-	path = mobile/src/main/jni/libudns
-	url = https://github.com/shadowsocks/libudns.git
 [submodule "mobile/src/overture/go"]
 	path = mobile/src/overture/go
 	url = https://github.com/shadowsocks/go.git
diff --git a/mobile/src/main/jni/Android.mk b/mobile/src/main/jni/Android.mk
index 2008c83f..ccc3b473 100755
--- a/mobile/src/main/jni/Android.mk
+++ b/mobile/src/main/jni/Android.mk
@@ -186,26 +186,7 @@ LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/libcork/src/libcork/,$(CORK_SOU
 include $(BUILD_STATIC_LIBRARY)
 
 ########################################################
-## libudns
-########################################################
-
-include $(CLEAR_VARS)
-
-UDNS_SOURCES := udns_dn.c udns_dntosp.c udns_parse.c udns_resolver.c udns_init.c \
-	udns_misc.c udns_XtoX.c \
-	udns_rr_a.c udns_rr_ptr.c udns_rr_mx.c udns_rr_txt.c udns_bl.c \
-	udns_rr_srv.c udns_rr_naptr.c udns_codes.c udns_jran.c
-
-LOCAL_MODULE := libudns
-LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/libudns \
-				-DHAVE_DECL_INET_NTOP
-
-LOCAL_SRC_FILES := $(addprefix libudns/,$(UDNS_SOURCES))
-
-include $(BUILD_STATIC_LIBRARY)
-
-########################################################
-## libev 
+## libev
 ########################################################
 
 include $(CLEAR_VARS)
@@ -215,7 +196,7 @@ LOCAL_CFLAGS += -O2 -DNDEBUG -DHAVE_CONFIG_H \
 				-I$(LOCAL_PATH)/include/libev
 LOCAL_SRC_FILES := \
 	libev/ev.c \
-	libev/event.c 
+	libev/event.c
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -264,7 +245,6 @@ LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DMODULE_LOCAL \
 					-I$(LOCAL_PATH)/libancillary \
 					-I$(LOCAL_PATH)/mbedtls/include  \
 					-I$(LOCAL_PATH)/pcre \
-					-I$(LOCAL_PATH)/libudns \
 					-I$(LOCAL_PATH)/libsodium/src/libsodium/include \
 					-I$(LOCAL_PATH)/libsodium/src/libsodium/include/sodium \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libcork/include \
@@ -272,7 +252,7 @@ LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DMODULE_LOCAL \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libbloom \
 					-I$(LOCAL_PATH)/libev
 
-LOCAL_STATIC_LIBRARIES := libev libmbedtls libipset libcork libbloom libudns \
+LOCAL_STATIC_LIBRARIES := libev libmbedtls libipset libcork libbloom \
 	libsodium libancillary libpcre
 
 LOCAL_LDLIBS := -llog
@@ -298,7 +278,6 @@ LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DMODULE_TUNNEL \
 					-DCONNECT_IN_PROGRESS=EINPROGRESS \
 					-I$(LOCAL_PATH)/libancillary \
 					-I$(LOCAL_PATH)/include \
-					-I$(LOCAL_PATH)/libudns \
 					-I$(LOCAL_PATH)/libsodium/src/libsodium/include \
 					-I$(LOCAL_PATH)/libsodium/src/libsodium/include/sodium \
 					-I$(LOCAL_PATH)/mbedtls/include \
@@ -307,7 +286,7 @@ LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DMODULE_TUNNEL \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libbloom \
 					-I$(LOCAL_PATH)/include/shadowsocks-libev
 
-LOCAL_STATIC_LIBRARIES := libev libmbedtls libsodium libcork libbloom libudns libancillary
+LOCAL_STATIC_LIBRARIES := libev libmbedtls libsodium libcork libbloom libancillary
 
 LOCAL_LDLIBS := -llog
 
diff --git a/mobile/src/main/jni/libudns b/mobile/src/main/jni/libudns
deleted file mode 160000
index 53a1abd2..00000000
--- a/mobile/src/main/jni/libudns
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 53a1abd2b6fd7e3bf99ce6e2e267c636618d57ef
diff --git a/mobile/src/main/jni/shadowsocks-libev b/mobile/src/main/jni/shadowsocks-libev
index 72622a3e..666801dd 160000
--- a/mobile/src/main/jni/shadowsocks-libev
+++ b/mobile/src/main/jni/shadowsocks-libev
@@ -1 +1 @@
-Subproject commit 72622a3e3df0d8b66f005717ecc48264275f453c
+Subproject commit 666801ddfcf70ebc7418b238129c9bfaa9325b44