From e766ae22445a74a2a1718477b2efbb97540320d1 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Sat, 6 Aug 2016 19:15:25 +0800
Subject: [PATCH] Fix the build sequence

---
 build.sh           | 23 +++++++++++------------
 travis-ci/setup.sh |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/build.sh b/build.sh
index 9d90145930..dd9980be1a 100755
--- a/build.sh
+++ b/build.sh
@@ -4,23 +4,22 @@ function try () {
 "$@" || exit -1
 }
 
-pushd kcptun
-try ./make.bash
-popd
-
-try pushd src/main
-
-# Build
-#try $ANDROID_NDK_HOME/ndk-build clean
+# Build native binaries
+pushd src/main
 try $ANDROID_NDK_HOME/ndk-build -j8
-
 # copy executables
 for app in pdnsd redsocks ss-local ss-tunnel tun2socks
 do
-    rm -f assets/armeabi-v7a/$app
-    rm -f assets/x86/$app
+    rm -f assets/armeabi-v7a
+    rm -f assets/x86
+    mkdir -p assets/armeabi-v7a
+    mkdir -p assets/x86
     try mv libs/armeabi-v7a/$app assets/armeabi-v7a/
     try mv libs/x86/$app assets/x86/
 done
+popd
 
-try popd
+# Build kcptun
+pushd kcptun
+try ./make.bash
+popd
diff --git a/travis-ci/setup.sh b/travis-ci/setup.sh
index 3f94548989..078c26f97c 100755
--- a/travis-ci/setup.sh
+++ b/travis-ci/setup.sh
@@ -26,7 +26,7 @@ if [ ! -d "$GOROOT_BOOTSTRAP" ]; then
     mkdir -p $GOROOT_BOOTSTRAP
     pushd $HOME/.android
     wget https://storage.googleapis.com/golang/go1.6.3.linux-amd64.tar.gz
-    tar xvf go1.6.3.linux-amd64.tar.gz
+    tar xf go1.6.3.linux-amd64.tar.gz
     popd
 fi