Add arm64 support

thelastfantasy · Mar 7, 2017 · a433822 · a433822
1 parent 60d7d90
commit a433822
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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