Commit e766ae22 authored by Max Lv's avatar Max Lv

Fix the build sequence

parent f3ed1571
...@@ -4,23 +4,22 @@ function try () { ...@@ -4,23 +4,22 @@ function try () {
"$@" || exit -1 "$@" || exit -1
} }
pushd kcptun # Build native binaries
try ./make.bash pushd src/main
popd
try pushd src/main
# Build
#try $ANDROID_NDK_HOME/ndk-build clean
try $ANDROID_NDK_HOME/ndk-build -j8 try $ANDROID_NDK_HOME/ndk-build -j8
# copy executables # copy executables
for app in pdnsd redsocks ss-local ss-tunnel tun2socks for app in pdnsd redsocks ss-local ss-tunnel tun2socks
do do
rm -f assets/armeabi-v7a/$app rm -f assets/armeabi-v7a
rm -f assets/x86/$app 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/armeabi-v7a/$app assets/armeabi-v7a/
try mv libs/x86/$app assets/x86/ try mv libs/x86/$app assets/x86/
done done
popd
try popd # Build kcptun
pushd kcptun
try ./make.bash
popd
...@@ -26,7 +26,7 @@ if [ ! -d "$GOROOT_BOOTSTRAP" ]; then ...@@ -26,7 +26,7 @@ if [ ! -d "$GOROOT_BOOTSTRAP" ]; then
mkdir -p $GOROOT_BOOTSTRAP mkdir -p $GOROOT_BOOTSTRAP
pushd $HOME/.android pushd $HOME/.android
wget https://storage.googleapis.com/golang/go1.6.3.linux-amd64.tar.gz 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 popd
fi fi
......
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