From a433822d0a528c08a4918540bfdc5002e42dbc42 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Tue, 7 Mar 2017 10:30:29 +0800
Subject: [PATCH] Add arm64 support

---
 .travis.yml                        | 2 +-
 mobile/build.sbt                   | 4 ++--
 mobile/src/main/jni/Android.mk     | 2 +-
 mobile/src/main/jni/Application.mk | 2 +-
 mobile/src/overture                | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 84fd6721..a9a15ed4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ jdk:
 
 env:
     global:
-        - NDK_VERSION=r12b
+        - NDK_VERSION=r14
         - NDK_CCACHE=ccache
         - GOROOT_BOOTSTRAP=$GOROOT
         - ANDROID_NDK_HOME=$HOME/.android/android-ndk-${NDK_VERSION}
diff --git a/mobile/build.sbt b/mobile/build.sbt
index 7c78074e..0a2f99f3 100644
--- a/mobile/build.sbt
+++ b/mobile/build.sbt
@@ -2,8 +2,8 @@ enablePlugins(AndroidApp)
 android.useSupportVectors
 
 name := "shadowsocks"
-version := "4.1.1"
-versionCode := Some(181)
+version := "4.1.2"
+versionCode := Some(182)
 
 proguardOptions ++=
   "-keep class com.github.shadowsocks.JniHelper { *; }" ::
diff --git a/mobile/src/main/jni/Android.mk b/mobile/src/main/jni/Android.mk
index a8089e22..518dc0d2 100755
--- a/mobile/src/main/jni/Android.mk
+++ b/mobile/src/main/jni/Android.mk
@@ -97,7 +97,7 @@ LIBEVENT_SOURCES := \
 
 LOCAL_MODULE := event
 LOCAL_SRC_FILES := $(addprefix libevent/, $(LIBEVENT_SOURCES))
-LOCAL_CFLAGS := -O2 -I$(LOCAL_PATH)/libevent \
+LOCAL_CFLAGS := -O2 -D_EVENT_HAVE_ARC4RANDOM -I$(LOCAL_PATH)/libevent \
 	-I$(LOCAL_PATH)/libevent/include \
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/mobile/src/main/jni/Application.mk b/mobile/src/main/jni/Application.mk
index e32dd558..e38747eb 100644
--- a/mobile/src/main/jni/Application.mk
+++ b/mobile/src/main/jni/Application.mk
@@ -1,4 +1,4 @@
-APP_ABI      			:= armeabi-v7a x86
+APP_ABI      			:= armeabi-v7a arm64-v8a x86
 APP_PLATFORM 			:= android-19
 APP_STL      			:= stlport_static
 NDK_TOOLCHAIN_VERSION 	:= clang
diff --git a/mobile/src/overture b/mobile/src/overture
index 5cb3f8c9..862ce347 160000
--- a/mobile/src/overture
+++ b/mobile/src/overture
@@ -1 +1 @@
-Subproject commit 5cb3f8c9e1723a26d408d28bbe491b1947b3e60f
+Subproject commit 862ce347e19483fdd6f0a5c84f173c2efdc7d920