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

Fix builds with Go 1.10 onwards (#1265)

Browse source
This commit is contained in:
Audrius Butkevicius 2019-01-11 23:11:42 +00:00 committed by GitHub
parent b4d41901d5
commit 9796d7beb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
syncthing/build-syncthing.py
View file

@ -111,12 +111,11 @@ for target in BUILD_TARGETS:
environ.update({
'GOPATH': module_dir,
'CGO_ENABLED': '1',
'CC': os.path.join(standalone_ndk_dir, 'bin', target['cc'])
})
subprocess.check_call([
'go', 'run', 'build.go', '-goos', 'android', '-goarch', target['goarch'],
] + pkg_argument + ['-no-upgrade', 'build'], env=environ, cwd=syncthing_dir)
'go', 'run', 'build.go', '-goos', 'android', '-goarch', target['goarch'], '-cc', os.path.join(standalone_ndk_dir, 'bin', target['cc'])
] + pkg_argument + ['-no-upgrade', 'build'], env=environ, cwd=syncthing_dir)
# Copy compiled binary to jniLibs folder
target_dir = os.path.join(project_dir, 'app', 'src', 'main', 'jniLibs', target['jni_dir'])

2
syncthing/src/github.com/syncthing/syncthing

@ -1 +1 @@
Subproject commit 03821d8bd3bcff790a4be3fda92c13c59c5dec80
Subproject commit d4f0544d9e3e3ddd254c36c45c6ee0522a05a2fa