Merge branch 'master' into jni

Conflicts: .travis.yml
shadowsocks · Jul 26, 2014 · 796d6f3 · 796d6f3
2 parents 429c67f + c2a1dac
commit 796d6f3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ before_install:
 - tar xf android-sdk_r23-linux.tgz
 - wget http://dl.google.com/android/ndk/android-ndk-r9d-linux-${ARCH}.tar.bz2
 - tar xf android-ndk-r9d-linux-${ARCH}.tar.bz2
-- export ANDROID_NDK_HOME=`pwd`/android-ndk-r9d
+- export ANDROID_NDK=`pwd`/android-ndk-r9d
 - export ANDROID_HOME=`pwd`/android-sdk-linux
 - export PATH=${PATH}:${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
 - echo "y" | android update sdk --filter tools,platform-tools,build-tools-20.0.0,android-19,extra-google-m2repository --no-ui --no-https -a