diff --git a/.travis.yml b/.travis.yml index 7fbc485e..5c932bbd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,9 @@ before_install: - export ARCH=`uname -m` - wget http://dl.google.com/android/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 -- tar xf android-ndk-r8e-linux-${ARCH}.tar.bz2 -- export ANDROID_NDK_HOME=`pwd`/android-ndk-r8e +- wget http://dl.google.com/android/ndk/android-ndk-r9-linux-${ARCH}.tar.bz2 +- tar xf android-ndk-r9-linux-${ARCH}.tar.bz2 +- export ANDROID_NDK_HOME=`pwd`/android-ndk-r9 - export ANDROID_HOME=`pwd`/android-sdk-linux - 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 diff --git a/src/main/jni/Android.mk b/src/main/jni/Android.mk index c5a450d8..e345ae02 100755 --- a/src/main/jni/Android.mk +++ b/src/main/jni/Android.mk @@ -123,7 +123,7 @@ include $(CLEAR_VARS) PDNSD_SOURCES := $(wildcard $(LOCAL_PATH)/pdnsd/*.c) 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 include $(BUILD_EXECUTABLE) diff --git a/src/main/jni/Application.mk b/src/main/jni/Application.mk index e8dd83c6..a52bf0fa 100644 --- a/src/main/jni/Application.mk +++ b/src/main/jni/Application.mk @@ -1,4 +1,4 @@ APP_ABI := armeabi x86 APP_PLATFORM := android-9 APP_STL := stlport_static -NDK_TOOLCHAIN_VERSION := 4.7 +NDK_TOOLCHAIN_VERSION := 4.8 diff --git a/src/main/scala/com/github/shadowsocks/Utils.scala b/src/main/scala/com/github/shadowsocks/Utils.scala index 0a7e831b..4cbefa0d 100644 --- a/src/main/scala/com/github/shadowsocks/Utils.scala +++ b/src/main/scala/com/github/shadowsocks/Utils.scala @@ -196,7 +196,7 @@ object Extra { val encMethod = settings.getString(Key.encMethod, "table") val remotePort: Int = try { 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 { Integer.valueOf(settings.getString(Key.remotePort, "1984")) }