From 6534a63529370a6d02712912cdaa3c3a1905076f Mon Sep 17 00:00:00 2001
From: Simon Frei <freisim93@gmail.com>
Date: Tue, 10 Dec 2019 10:39:47 +0100
Subject: [PATCH] Bump ndk version and revert specific go1.13 dep

---
 metadata/com.nutomic.syncthingandroid.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/metadata/com.nutomic.syncthingandroid.yml b/metadata/com.nutomic.syncthingandroid.yml
index cf6a5c8ce1..9b76aa9015 100644
--- a/metadata/com.nutomic.syncthingandroid.yml
+++ b/metadata/com.nutomic.syncthingandroid.yml
@@ -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