Commit 0891a12e authored by Mygod's avatar Mygod

Refine go-build again

parent de2bfdf2
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
[[ -z "${ANDROID_NDK_HOME}" ]] && ANDROID_NDK_HOME="${ANDROID_HOME}/ndk-bundle" [[ -z "${ANDROID_NDK_HOME}" ]] && ANDROID_NDK_HOME="${ANDROID_HOME}/ndk-bundle"
TOOLCHAIN="$(find ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/* -maxdepth 1 -type d -print -quit)/bin" TOOLCHAIN="$(find ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/* -maxdepth 1 -type d -print -quit)/bin"
ABIS=(armeabi-v7a arm64-v8a x86 x86_64)
GO_ARCHS=('arm GOARM=7' arm64 386 amd64)
CLANG_ARCHS=(armv7a-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android)
STRIP_ARCHS=(arm-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android)
MIN_API="$1" MIN_API="$1"
ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
...@@ -9,11 +13,6 @@ OUT_DIR="$ROOT/build/go" ...@@ -9,11 +13,6 @@ OUT_DIR="$ROOT/build/go"
cd "$ROOT/src/main/jni/overture/main" cd "$ROOT/src/main/jni/overture/main"
BIN="liboverture.so" BIN="liboverture.so"
ABIS=(armeabi-v7a arm64-v8a x86 x86_64)
GO_ARCHS=('arm GOARM=7' arm64 386 amd64)
CLANG_ARCHS=(armv7a-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android)
STRIP_ARCHS=(arm-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android)
for i in "${!ABIS[@]}"; do for i in "${!ABIS[@]}"; do
ABI="${ABIS[$i]}" ABI="${ABIS[$i]}"
[[ -f "${OUT_DIR}/${ABI}/${BIN}" ]] && continue [[ -f "${OUT_DIR}/${ABI}/${BIN}" ]] && continue
...@@ -29,4 +28,3 @@ for i in "${!ABIS[@]}"; do ...@@ -29,4 +28,3 @@ for i in "${!ABIS[@]}"; do
done done
cd "$ROOT" cd "$ROOT"
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