update travis

.gitignore

@@ -24,17 +24,6 @@ local.sbt
 out/
 
 #NDK
-src/main/libs/armeabi/ip6tables
-src/main/libs/armeabi/iptables
-src/main/libs/armeabi/obfsproxy
-src/main/libs/armeabi/pdnsd
-src/main/libs/armeabi/polipo
-src/main/libs/armeabi/redsocks
-src/main/libs/armeabi/shadowsocks
-src/main/libs/x86/ip6tables
-src/main/libs/x86/iptables
-src/main/libs/x86/obfsproxy
-src/main/libs/x86/pdnsd
-src/main/libs/x86/polipo
-src/main/libs/x86/redsocks
-src/main/libs/x86/shadowsocks
+src/main/libs
+src/main/assets/arm
+src/main/assets/x86

.travis.yml

@@ -7,14 +7,19 @@ before_install:
 - sudo apt-get install libx11-dev
 - sudo apt-get install g++-multilib
 - sudo apt-get install lib32z1-dev
+- export ARCH=`uname -m`
 - wget http://dl.google.com/android/android-sdk_r21-linux.tgz
 - tar -zxf android-sdk_r21-linux.tgz
+- wget http://dl.google.com/android/ndk/android-ndk-r8e-linux-${ARCH}.tar.bz2
+- tar -zxf android-ndk-r8e-linux-${ARCH}.tar.bz2
+- export ANDROID_NDK_HOME=`pwd`/android-ndk-r8e
 - export ANDROID_HOME=`pwd`/android-sdk-linux
-- export PATH=${PATH}:${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
 install:
 - gem install travis-artifacts
 script:
+- ./build-ndk.sh
 - wget https://raw.github.com/paulp/sbt-extras/master/sbt
 - chmod u+x ./sbt
 - cp local.sbt.example local.sbt

src/main/jni/Android.mk

@@ -68,37 +68,41 @@ include $(BUILD_EXECUTABLE)
 ## obfsproxy
 ########################################################
 
-include $(CLEAR_VARS)
+# include $(CLEAR_VARS)
+# 
+# OBFSPROXY_SOURCES := container.c crypt.c external.c \
+# 	main.c managed.c network.c \
+# 	obfs_main.c protocol.c sha256.c \
+# 	socks.c status.c util.c \
+# 	protocols/dummy.c protocols/obfs2.c
+# 
+# LOCAL_STATIC_LIBRARIES := libevent libcrypto
+# 
+# LOCAL_MODULE := obfsproxy
+# LOCAL_SRC_FILES := $(addprefix obfsproxy/, $(OBFSPROXY_SOURCES))
+# LOCAL_CFLAGS := -O2 -g -I$(LOCAL_PATH)/obfsproxy \
+# 	-I$(LOCAL_PATH)/libevent/include \
+# 	-I$(LOCAL_PATH)/libevent \
+# 	-I$(LOCAL_PATH)/openssl/include
+# 
+# include $(BUILD_EXECUTABLE)
 
-OBFSPROXY_SOURCES := container.c crypt.c external.c \
-	main.c managed.c network.c \
-	obfs_main.c protocol.c sha256.c \
-	socks.c status.c util.c \
-	protocols/dummy.c protocols/obfs2.c
+########################################################
+## polipo
+########################################################
 
-LOCAL_STATIC_LIBRARIES := libevent libcrypto
+# include $(CLEAR_VARS)
 
-LOCAL_MODULE := obfsproxy
-LOCAL_SRC_FILES := $(addprefix obfsproxy/, $(OBFSPROXY_SOURCES))
-LOCAL_CFLAGS := -O2 -g -I$(LOCAL_PATH)/obfsproxy \
-	-I$(LOCAL_PATH)/libevent/include \
-	-I$(LOCAL_PATH)/libevent \
-	-I$(LOCAL_PATH)/openssl/include
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-POLIPO_SOURCES := util.c event.c io.c chunk.c atom.c object.c log.c diskcache.c main.c \
-	config.c local.c http.c client.c server.c auth.c tunnel.c \
-	http_parse.c parse_time.c dns.c forbidden.c \
-	md5.c fts_compat.c socks.c mingw.c
-
-LOCAL_MODULE := polipo
-LOCAL_SRC_FILES := $(addprefix polipo/, $(POLIPO_SOURCES))
-LOCAL_CFLAGS := -O2 -g -DHAS_STDINT_H -DNO_DISK_CACHE -DNO_SYSLOG -I$(LOCAL_PATH)/polipo
-
-include $(BUILD_EXECUTABLE)
+# POLIPO_SOURCES := util.c event.c io.c chunk.c atom.c object.c log.c diskcache.c main.c \
+# 	config.c local.c http.c client.c server.c auth.c tunnel.c \
+# 	http_parse.c parse_time.c dns.c forbidden.c \
+# 	md5.c fts_compat.c socks.c mingw.c
+# 
+# LOCAL_MODULE := polipo
+# LOCAL_SRC_FILES := $(addprefix polipo/, $(POLIPO_SOURCES))
+# LOCAL_CFLAGS := -O2 -g -DHAS_STDINT_H -DNO_DISK_CACHE -DNO_SYSLOG -I$(LOCAL_PATH)/polipo
+# 
+# include $(BUILD_EXECUTABLE)
 
 ########################################################
 ## pdnsd