Commit a433822d authored by Max Lv's avatar Max Lv

Add arm64 support

parent 60d7d905
...@@ -5,7 +5,7 @@ jdk: ...@@ -5,7 +5,7 @@ jdk:
env: env:
global: global:
- NDK_VERSION=r12b - NDK_VERSION=r14
- NDK_CCACHE=ccache - NDK_CCACHE=ccache
- GOROOT_BOOTSTRAP=$GOROOT - GOROOT_BOOTSTRAP=$GOROOT
- ANDROID_NDK_HOME=$HOME/.android/android-ndk-${NDK_VERSION} - ANDROID_NDK_HOME=$HOME/.android/android-ndk-${NDK_VERSION}
......
...@@ -2,8 +2,8 @@ enablePlugins(AndroidApp) ...@@ -2,8 +2,8 @@ enablePlugins(AndroidApp)
android.useSupportVectors android.useSupportVectors
name := "shadowsocks" name := "shadowsocks"
version := "4.1.1" version := "4.1.2"
versionCode := Some(181) versionCode := Some(182)
proguardOptions ++= proguardOptions ++=
"-keep class com.github.shadowsocks.JniHelper { *; }" :: "-keep class com.github.shadowsocks.JniHelper { *; }" ::
......
...@@ -97,7 +97,7 @@ LIBEVENT_SOURCES := \ ...@@ -97,7 +97,7 @@ LIBEVENT_SOURCES := \
LOCAL_MODULE := event LOCAL_MODULE := event
LOCAL_SRC_FILES := $(addprefix libevent/, $(LIBEVENT_SOURCES)) 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 \ -I$(LOCAL_PATH)/libevent/include \
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
......
APP_ABI := armeabi-v7a x86 APP_ABI := armeabi-v7a arm64-v8a x86
APP_PLATFORM := android-19 APP_PLATFORM := android-19
APP_STL := stlport_static APP_STL := stlport_static
NDK_TOOLCHAIN_VERSION := clang NDK_TOOLCHAIN_VERSION := clang
Subproject commit 5cb3f8c9e1723a26d408d28bbe491b1947b3e60f Subproject commit 862ce347e19483fdd6f0a5c84f173c2efdc7d920
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment