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

build x86_64 binary to accomodate google play (#1430)

Browse source
This commit is contained in:
Simon Frei 2019-11-05 11:02:24 +01:00 committed by GitHub
parent 7a66269dbd
commit c7b433bc65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.travis.yml
View file

@ -14,9 +14,10 @@ android:
# Install Android NDK (apparently there is no easier way to do this) # Install Android NDK (apparently there is no easier way to do this)
# https://github.com/travis-ci/travis-ci/issues/5395 # https://github.com/travis-ci/travis-ci/issues/5395
before_script: before_script:
- curl -L https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip -O - export NDK_VERSION=r20
- unzip -q android-ndk-r15c-linux-x86_64.zip - curl -L https://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-linux-x86_64.zip -O
- export ANDROID_NDK_HOME=`pwd`/android-ndk-r15c - unzip -q android-ndk-${NDK_VERSION}-linux-x86_64.zip
- export ANDROID_NDK_HOME=`pwd`/android-ndk-${NDK_VERSION}
before_install: before_install:
# Install Go using gimme tool # Install Go using gimme tool

6
docker/prebuild.sh
View file

@ -2,7 +2,7 @@
[ -z "$SYNCTHING_ANDROID_PREBUILT" ] && echo "Prebuild disabled" && exit 0 [ -z "$SYNCTHING_ANDROID_PREBUILT" ] && echo "Prebuild disabled" && exit 0
for ARCH in arm x86 arm64; do for ARCH in arm x86 arm64 x86_64; do
GOARCH=${ARCH} GOARCH=${ARCH}
SDK=16 SDK=16
case ${ARCH} in case ${ARCH} in
@ -17,6 +17,10 @@ for ARCH in arm x86 arm64; do
GOARCH=386 GOARCH=386
GCC="i686-linux-android-clang" GCC="i686-linux-android-clang"
;; ;;
x86_64)
SDK=21
GCC="x86_64-linux-android21-clang"
;;
*) *)
echo "Invalid architecture" echo "Invalid architecture"
exit 1 exit 1

7
syncthing/build-syncthing.py
View file

@ -26,6 +26,13 @@ BUILD_TARGETS = [
'goarch': '386', 'goarch': '386',
'jni_dir': 'x86', 'jni_dir': 'x86',
'cc': 'i686-linux-android-clang', 'cc': 'i686-linux-android-clang',
},
{
'arch': 'x86_64',
'goarch': 'amd64',
'jni_dir': 'x86_64',
'cc': 'x86_64-linux-android21-clang',
'min_sdk': 21,
} }
] ]