From fa71329048810f38c30bb677544c30df7e3e40e2 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Sat, 6 Nov 2021 00:14:02 +0800
Subject: [PATCH] PCAPdroid, Syncthing:Enable apps requiring ndk r23

---
 metadata/com.emanuelef.remote_capture.yml | 5 ++---
 metadata/com.nutomic.syncthingandroid.yml | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/metadata/com.emanuelef.remote_capture.yml b/metadata/com.emanuelef.remote_capture.yml
index 23324a55a5..718ebb0b3d 100644
--- a/metadata/com.emanuelef.remote_capture.yml
+++ b/metadata/com.emanuelef.remote_capture.yml
@@ -258,7 +258,6 @@ Builds:
 
   - versionName: 1.4.3
     versionCode: 37
-    disable: ndk r23 doesn't work
     commit: 1802df9eb8b5a13271a949159ca0b06318a45541
     subdir: app
     submodules: true
@@ -271,9 +270,9 @@ Builds:
     gradle:
       - yes
     prebuild:
-      - sed -i -e '/3.18.1/d' build.gradle
+      - sed -i -e '/3.18.1/d' -e 's/23.1.7779620/23.0.7599858/' build.gradle
       - sed -i -e 's/3.18.1/3.10.2/' src/main/jni/CMakeLists.txt
-    ndk: r23b
+    ndk: r23
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
diff --git a/metadata/com.nutomic.syncthingandroid.yml b/metadata/com.nutomic.syncthingandroid.yml
index 8ffb19ab23..79e85e853a 100644
--- a/metadata/com.nutomic.syncthingandroid.yml
+++ b/metadata/com.nutomic.syncthingandroid.yml
@@ -1701,7 +1701,6 @@ Builds:
 
   - versionName: 1.18.3
     versionCode: 4286
-    disable: https://github.com/syncthing/syncthing-android/issues/1707
     commit: 63cb62df320e13029839c9053cf301552c07ae9e
     submodules: true
     sudo:
@@ -1718,7 +1717,7 @@ Builds:
     prebuild: sed -i -e '/signingConfig/d' app/build.gradle
     scanignore:
       - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
-    ndk: r23
+    ndk: r21e
     preassemble:
       - buildNative