Fix the build sequence
This commit is contained in:
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user