nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-30 00:01:19 +00:00
Code Releases Activity

Use correct platform for Syncthing build (fixes #982)

Browse source
This commit is contained in:
Felix Ableitner 2017-11-09 12:18:01 +09:00
parent cb5e9b48ba
commit 522d43f620
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
syncthing/build-syncthing.bash
View file

@ -4,7 +4,7 @@ set -e
MODULE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" MODULE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
PROJECT_DIR="${MODULE_DIR}/.." PROJECT_DIR="${MODULE_DIR}/.."
TARGET_SDK=$(grep "targetSdkVersion" "${PROJECT_DIR}/app/build.gradle" -m 1 | awk '{print $2}') MIN_SDK=$(grep "minSdkVersion" "${PROJECT_DIR}/app/build.gradle" -m 1 | awk '{print $2}')
# Use seperate build dir so standalone ndk isn't deleted by `gradle clean` # Use seperate build dir so standalone ndk isn't deleted by `gradle clean`
BUILD_DIR="${MODULE_DIR}/gobuild" BUILD_DIR="${MODULE_DIR}/gobuild"
export GOPATH="${MODULE_DIR}/" export GOPATH="${MODULE_DIR}/"
@ -27,6 +27,8 @@ for ANDROID_ARCH in arm x86 arm64; do
GOARCH=arm64 GOARCH=arm64
JNI_DIR="arm64-v8a" JNI_DIR="arm64-v8a"
GCC="aarch64-linux-android-clang" GCC="aarch64-linux-android-clang"
# arm64 requires at least API 21.
MIN_SDK=21
;; ;;
x86) x86)
GOARCH=386 GOARCH=386
@ -40,12 +42,12 @@ for ANDROID_ARCH in arm x86 arm64; do
# Build standalone NDK toolchain if it doesn't exist. # Build standalone NDK toolchain if it doesn't exist.
# https://developer.android.com/ndk/guides/standalone_toolchain.html # https://developer.android.com/ndk/guides/standalone_toolchain.html
STANDALONE_NDK_DIR="${BUILD_DIR}/standalone-ndk/android-${TARGET_SDK}-${GOARCH}" STANDALONE_NDK_DIR="${BUILD_DIR}/standalone-ndk/android-${MIN_SDK}-${GOARCH}"
if [ ! -d "$STANDALONE_NDK_DIR" ]; then if [ ! -d "$STANDALONE_NDK_DIR" ]; then
echo -e "Building standalone NDK\n" echo -e "Building standalone NDK\n"
${ANDROID_NDK_HOME}/build/tools/make-standalone-toolchain.sh \ ${ANDROID_NDK_HOME}/build/tools/make-standalone-toolchain.sh \
--platform=android-${TARGET_SDK} --arch=${ANDROID_ARCH} \ --platform=android-${MIN_SDK} --arch=${ANDROID_ARCH} \
--install-dir=${STANDALONE_NDK_DIR} --install-dir=${STANDALONE_NDK_DIR}
fi fi