From 98cd172c5bd807c84f9a8de209ebe4e39a219b6c Mon Sep 17 00:00:00 2001
From: esdeathlove <esdeathlove@gmail.com>
Date: Sat, 25 Mar 2017 00:38:23 +0800
Subject: [PATCH] Revert "arm64"

This reverts commit 45b4886b3dab10bea7bb9dd1754502ad12683133.
---
 .gitignore                  | 1 -
 .gitmodules                 | 8 ++++----
 build.sh                    | 3 ---
 src/main/jni/Application.mk | 2 +-
 src/main/jni/libevent       | 2 +-
 src/main/jni/system.cpp     | 2 --
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 12e42690fa..659d10c986 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,5 @@ src/main/libs
 src/main/assets/armeabi
 src/main/assets/armeabi-v7a
 src/main/assets/x86
-src/main/assets/arm64-v8a
 src/main/assets/api-16/
 jni/Application.mk
diff --git a/.gitmodules b/.gitmodules
index 538b98f22f..f8b61ccc24 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,6 +6,10 @@
 	path = src/main/jni/libancillary
 	url = https://github.com/shadowsocks/libancillary.git
 	branch = shadowsocks-android
+[submodule "src/main/jni/libevent"]
+	path = src/main/jni/libevent
+	url = https://github.com/shadowsocks/libevent.git
+	branch = shadowsocks-android
 [submodule "src/main/jni/redsocks"]
 	path = src/main/jni/redsocks
 	url = https://github.com/shadowsocks/redsocks.git
@@ -24,7 +28,3 @@
 [submodule "src/main/jni/pcre"]
 	path = src/main/jni/pcre
 	url = https://android.googlesource.com/platform/external/pcre
-[submodule "src/main/jni/libevent"]
-	path = src/main/jni/libevent
-	url = https://github.com/esdeathlove/libevent.git
-	branch = shadowsocks-android
diff --git a/build.sh b/build.sh
index 77f742853e..166cbdfd4f 100755
--- a/build.sh
+++ b/build.sh
@@ -11,16 +11,13 @@ try pushd src/main
 try ${ANDROID_NDK_HOME}/ndk-build -j8
 
 # copy executables
-rm -rf assets/arm64-v8a
 rm -rf assets/armeabi-v7a
 rm -rf assets/x86
-mkdir -p assets/arm64-v8a
 mkdir -p assets/armeabi-v7a
 mkdir -p assets/x86
 for app in pdnsd redsocks ss-local ss-tunnel tun2socks
 do
     try mv libs/armeabi-v7a/$app assets/armeabi-v7a/
-    try mv libs/arm64-v8a/$app assets/arm64-v8a/
     try mv libs/x86/$app assets/x86/
 done
 
diff --git a/src/main/jni/Application.mk b/src/main/jni/Application.mk
index 8f8e6011a6..8ea8eb3762 100644
--- a/src/main/jni/Application.mk
+++ b/src/main/jni/Application.mk
@@ -1,4 +1,4 @@
-APP_ABI      			:= arm64-v8a armeabi-v7a x86
+APP_ABI      			:= armeabi-v7a x86
 APP_PLATFORM 			:= android-16
 APP_STL      			:= stlport_static
 NDK_TOOLCHAIN_VERSION 	:= clang
diff --git a/src/main/jni/libevent b/src/main/jni/libevent
index 6505f66044..5d5914f00b 160000
--- a/src/main/jni/libevent
+++ b/src/main/jni/libevent
@@ -1 +1 @@
-Subproject commit 6505f6604473ace2d858ff33e268282e67fc8870
+Subproject commit 5d5914f00b8adefd383f66b8b352855ece22a1d7
diff --git a/src/main/jni/system.cpp b/src/main/jni/system.cpp
index 349ae6890f..dcad8aa36a 100644
--- a/src/main/jni/system.cpp
+++ b/src/main/jni/system.cpp
@@ -27,8 +27,6 @@ jstring Java_com_github_shadowsocks_system_getabi(JNIEnv *env, jobject thiz) {
     abi = "x86";
   } else if (family == ANDROID_CPU_FAMILY_MIPS) {
     abi = "mips";
-  } else if (family == ANDROID_CPU_FAMILY_ARM64) {
-    abi = "arm64-v8a";
   } else if (family == ANDROID_CPU_FAMILY_ARM) {
     // if (features & ANDROID_CPU_ARM_FEATURE_ARMv7) {
     abi = "armeabi-v7a";