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

Use default folder for syncthing binaries.

Browse source
This commit is contained in:
Felix Ableitner 2016-04-13 23:59:50 +02:00
parent 80b0578b73
commit 9c06ae22c5
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -12,7 +12,7 @@
bin/ bin/
build/ build/
gen/ gen/
libs/ src/main/jniLibs/
obj/ obj/
.gradle/ .gradle/

10
build.gradle
View file

@ -45,12 +45,6 @@ android {
testFunctionalTest true testFunctionalTest true
} }
sourceSets {
main {
jniLibs.srcDir file("libs/")
}
}
// Without this parameter, all builds fail with error: // Without this parameter, all builds fail with error:
// Execution failed for task ':mergeArmeabiDebugResources'. // Execution failed for task ':mergeArmeabiDebugResources'.
// > Some file crunching failed, see logs for details // > Some file crunching failed, see logs for details
@ -110,9 +104,7 @@ task buildNative(type: Exec) {
} }
task cleanNative(type: Delete) { task cleanNative(type: Delete) {
delete 'bin/' delete 'src/main/jniLibs/'
delete 'build/'
delete 'libs/'
delete 'ext/syncthing/bin/' delete 'ext/syncthing/bin/'
delete 'ext/syncthing/pkg/' delete 'ext/syncthing/pkg/'
} }

7
make-syncthing.bash
View file

@ -5,6 +5,7 @@ set -e
RESET=1 RESET=1
MYDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" MYDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
JNIDIR="/src/main/jniLibs"
case "$1" in case "$1" in
arm) arm)
@ -12,20 +13,20 @@ case "$1" in
export GOOS=linux export GOOS=linux
export GOARCH=arm export GOARCH=arm
export GOARM=5 export GOARM=5
export TARGETDIR=${MYDIR}/libs/armeabi export TARGETDIR=$MYDIR$JNIDIR/armeabi
;; ;;
386) 386)
export CGO_ENABLED=0 export CGO_ENABLED=0
export GOOS=linux export GOOS=linux
export GOARCH=386 export GOARCH=386
export GO386=387 export GO386=387
export TARGETDIR=${MYDIR}/libs/x86 export TARGETDIR=$MYDIR$JNIDIR/x86
;; ;;
amd64) amd64)
export CGO_ENABLED=0 export CGO_ENABLED=0
export GOOS=linux export GOOS=linux
export GOARCH=amd64 export GOARCH=amd64
export TARGETDIR=${MYDIR}/libs/x86_64 export TARGETDIR=$MYDIR$JNIDIR/x86_64
;; ;;
*) *)
echo "Must specify either arm or 386 or amd64" echo "Must specify either arm or 386 or amd64"