Commit 1bed08a7 authored by Max Lv's avatar Max Lv

Merge branch 'master' of github.com:shadowsocks/shadowsocks-android

parents 7ddaceb0 9bf23231
...@@ -13,9 +13,9 @@ before_install: ...@@ -13,9 +13,9 @@ before_install:
- export ARCH=`uname -m` - export ARCH=`uname -m`
- wget http://dl.google.com/android/android-sdk_r21-linux.tgz - wget http://dl.google.com/android/android-sdk_r21-linux.tgz
- tar xf android-sdk_r21-linux.tgz - tar xf android-sdk_r21-linux.tgz
- wget http://dl.google.com/android/ndk/android-ndk-r8e-linux-${ARCH}.tar.bz2 - wget http://dl.google.com/android/ndk/android-ndk-r9-linux-${ARCH}.tar.bz2
- tar xf android-ndk-r8e-linux-${ARCH}.tar.bz2 - tar xf android-ndk-r9-linux-${ARCH}.tar.bz2
- export ANDROID_NDK_HOME=`pwd`/android-ndk-r8e - export ANDROID_NDK_HOME=`pwd`/android-ndk-r9
- export ANDROID_HOME=`pwd`/android-sdk-linux - export ANDROID_HOME=`pwd`/android-sdk-linux
- export PATH=${PATH}:${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools - export PATH=${PATH}:${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
- android update sdk --filter tools,platform-tools,android-16 --no-ui --no-https -a - android update sdk --filter tools,platform-tools,android-16 --no-ui --no-https -a
......
...@@ -123,7 +123,7 @@ include $(CLEAR_VARS) ...@@ -123,7 +123,7 @@ include $(CLEAR_VARS)
PDNSD_SOURCES := $(wildcard $(LOCAL_PATH)/pdnsd/*.c) PDNSD_SOURCES := $(wildcard $(LOCAL_PATH)/pdnsd/*.c)
LOCAL_MODULE := pdnsd LOCAL_MODULE := pdnsd
LOCAL_SRC_FILES := $(PDNSD_SOURCES:$(LOCAL_PATH)%=%) LOCAL_SRC_FILES := $(PDNSD_SOURCES:$(LOCAL_PATH)/%=%)
LOCAL_CFLAGS := -Wall -O2 -I$(LOCAL_PATH)/pdnsd LOCAL_CFLAGS := -Wall -O2 -I$(LOCAL_PATH)/pdnsd
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
......
APP_ABI := armeabi x86 APP_ABI := armeabi x86
APP_PLATFORM := android-9 APP_PLATFORM := android-9
APP_STL := stlport_static APP_STL := stlport_static
NDK_TOOLCHAIN_VERSION := 4.7 NDK_TOOLCHAIN_VERSION := 4.8
...@@ -196,7 +196,7 @@ object Extra { ...@@ -196,7 +196,7 @@ object Extra {
val encMethod = settings.getString(Key.encMethod, "table") val encMethod = settings.getString(Key.encMethod, "table")
val remotePort: Int = try { val remotePort: Int = try {
if (proxy == BuildConfig.SERVER) { if (proxy == BuildConfig.SERVER) {
scala.util.Random.shuffle(Seq(20, 21, 23, 443)).toSeq(0) scala.util.Random.shuffle(Seq(20, 21, 23)).toSeq(0)
} else { } else {
Integer.valueOf(settings.getString(Key.remotePort, "1984")) Integer.valueOf(settings.getString(Key.remotePort, "1984"))
} }
......
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