From 5c89d164acf4211104961f8a026f8efe186907f7 Mon Sep 17 00:00:00 2001
From: yourok <8yourok8@mail.ru>
Date: Fri, 17 May 2019 11:27:12 +0300
Subject: [PATCH] change toolchains path

---
 .gitignore   |  2 +-
 build-all.sh | 23 ++++++++++-------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index e25ab77..d51db16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,4 @@ src/gopkg.in/
 pkg/
 bin/
 dist/
-toolchain/
+toolchains/
diff --git a/build-all.sh b/build-all.sh
index cb9b5e7..114791e 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -119,40 +119,37 @@ export CGO_ENABLED=1
 export GOOS=android 
 export LDFLAGS="-s -w"
 
-export NDK_TOOLCHAIN=/home/yourok/Space/Projects/GO/TorrServer/pkg/gomobile/ndk-toolchains/arm
-export CC=$NDK_TOOLCHAIN/bin/arm-linux-androideabi-clang
-export CXX=$NDK_TOOLCHAIN/bin/arm-linux-androideabi-clang++
+export NDK_TOOLCHAIN=/space/Projects/GO/TorrServer/toolchains
+export CC=$NDK_TOOLCHAIN/bin/armv7a-linux-androideabi28-clang
+export CXX=$NDK_TOOLCHAIN/bin/armv7a-linux-androideabi28-clang++
 export GOARCH=arm 
 export GOARM=7
 BIN_FILENAME="dist/TorrServer-${GOOS}-${GOARCH}${GOARM}"
 echo "Android ${BIN_FILENAME}"
 go build -ldflags="${LDFLAGS}" -o ${BIN_FILENAME} main
 
-export NDK_TOOLCHAIN=/home/yourok/Space/Projects/GO/TorrServer/pkg/gomobile/ndk-toolchains/arm64
-export CC=$NDK_TOOLCHAIN/bin/aarch64-linux-android-clang
-export CXX=$NDK_TOOLCHAIN/bin/aarch64-linux-android-clang++
+export CC=$NDK_TOOLCHAIN/bin/aaarch64-linux-android28-clang
+export CXX=$NDK_TOOLCHAIN/bin/aarch64-linux-android28-clang++
 export GOARCH=arm64
 export GOARM=""
 BIN_FILENAME="dist/TorrServer-${GOOS}-${GOARCH}${GOARM}"
 echo "Android ${BIN_FILENAME}"
 go build -ldflags="${LDFLAGS}" -o ${BIN_FILENAME} main
 
-export NDK_TOOLCHAIN=/home/yourok/Space/Projects/GO/TorrServer/pkg/gomobile/ndk-toolchains/x86
-export CC=$NDK_TOOLCHAIN/bin/i686-linux-android-clang
-export CXX=$NDK_TOOLCHAIN/bin/i686-linux-android-clang++
+export CC=$NDK_TOOLCHAIN/bin/i686-linux-android28-clang
+export CXX=$NDK_TOOLCHAIN/bin/i686-linux-android28-clang++
 export GOARCH=386
 export GOARM=""
 BIN_FILENAME="dist/TorrServer-${GOOS}-${GOARCH}${GOARM}"
 echo "Android ${BIN_FILENAME}"
 go build -ldflags="${LDFLAGS}" -o ${BIN_FILENAME} main
 
-export NDK_TOOLCHAIN=/home/yourok/Space/Projects/GO/TorrServer/pkg/gomobile/ndk-toolchains/x86_64
-export CC=$NDK_TOOLCHAIN/bin/x86_64-linux-android-clang
-export CXX=$NDK_TOOLCHAIN/bin/x86_64-linux-android-clang++
+export CC=$NDK_TOOLCHAIN/bin/x86_64-linux-android28-clang
+export CXX=$NDK_TOOLCHAIN/bin/x86_64-linux-android28-clang++
 export GOARCH=amd64
 export GOARM=""
 BIN_FILENAME="dist/TorrServer-${GOOS}-${GOARCH}${GOARM}"
 echo "Android ${BIN_FILENAME}"
 go build -ldflags="${LDFLAGS}" -o ${BIN_FILENAME} main
 
-# ./compile.sh
\ No newline at end of file
+# ./compile.sh