Merge branch 'syncthing/ndk' into 'master'

Bump ndk version and revert specific go1.13 dep

See merge request fdroid/fdroiddata!6045
This commit is contained in:
Marcus 2019-12-10 10:00:07 +00:00
commit 6caf0b0dfc

View file

@ -1314,16 +1314,14 @@ Builds:
submodules: true
sudo:
- apt update || apt update
- apt install -y -t testing golang-1.13-go
- ln -s /usr/lib/go-1.13 /usr/lib/go
- ln -s /usr/lib/go-1.13/bin/go /usr/bin/go
- apt install -y -t testing golang-go
gradle:
- yes
output: app/build/outputs/apk/release/app-release-unsigned.apk
prebuild: sed -i -e '/signingConfig/d' app/build.gradle
scanignore:
- syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
ndk: r15c
ndk: r20
preassemble:
- buildNative