From 1540d54f404c43d8aff712276e54fdb7ae2a76be Mon Sep 17 00:00:00 2001
From: Licaon_Kter <licaon.kter@protonmail.com>
Date: Thu, 18 Jun 2020 14:16:01 +0300
Subject: [PATCH] NDK 21d fixes

---
 metadata/com.foobnix.pro.pdf.reader.yml        |  3 ++-
 metadata/com.ichi2.anki.yml                    |  2 +-
 metadata/com.termux.yml                        |  2 +-
 metadata/eu.faircode.email.yml                 | 12 +-----------
 metadata/eu.faircode.netguard.yml              |  2 +-
 metadata/eu.siacs.conversations.yml            |  2 +-
 metadata/net.kollnig.missioncontrol.fdroid.yml |  2 +-
 metadata/se.lublin.mumla.yml                   |  2 +-
 8 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/metadata/com.foobnix.pro.pdf.reader.yml b/metadata/com.foobnix.pro.pdf.reader.yml
index 245bf36a2a..0c945aa703 100644
--- a/metadata/com.foobnix.pro.pdf.reader.yml
+++ b/metadata/com.foobnix.pro.pdf.reader.yml
@@ -405,10 +405,11 @@ Builds:
       - sed -i -e '/^#!/a\set -e' -e 's|git clone .*|ln -s $$MuPDF$$ mupdf-$VERSION|'
         -e 's/ndk-build $1/& -j`nproc` || exit 1/' ../Builder/link_to_mupdf_1.16.1.sh
       - mkdir src/main/jniLibs/
+      - sed -i -e 's/21.2.6472646/21.3.6528147/' build.gradle
     build:
       - pushd ../Builder/
       - ./link_to_mupdf_1.16.1.sh
-    ndk: r21c
+    ndk: r21d
 
 MaintainerNotes: Upstream builds separate APKs for each architecture but we build
     an universal APK.
diff --git a/metadata/com.ichi2.anki.yml b/metadata/com.ichi2.anki.yml
index d846181c6e..5c3d359989 100644
--- a/metadata/com.ichi2.anki.yml
+++ b/metadata/com.ichi2.anki.yml
@@ -550,7 +550,7 @@ Builds:
     rm:
       - tools
       - docs
-    ndk: r21b
+    ndk: r21d
 
 MaintainerNotes: Uses DexLoader to load custom decks and plugins (?).
 
diff --git a/metadata/com.termux.yml b/metadata/com.termux.yml
index 37447c040f..3e1766642b 100644
--- a/metadata/com.termux.yml
+++ b/metadata/com.termux.yml
@@ -585,7 +585,7 @@ Builds:
     subdir: app
     gradle:
       - yes
-    ndk: r21b
+    ndk: r21d
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml
index b95aeaf362..28c99505ff 100644
--- a/metadata/eu.faircode.email.yml
+++ b/metadata/eu.faircode.email.yml
@@ -2578,16 +2578,6 @@ Builds:
     prebuild: sed -i -e '/keystoreProperties/d' build.gradle
     ndk: r21b
 
-  - versionName: '1.1206'
-    versionCode: 1206
-    commit: '1.1206'
-    subdir: app
-    submodules: true
-    gradle:
-      - fdroid
-    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
-    ndk: r21b
-
   - versionName: '1.1207'
     versionCode: 1207
     commit: '1.1207'
@@ -2596,7 +2586,7 @@ Builds:
     gradle:
       - fdroid
     prebuild: sed -i -e '/keystoreProperties/d' build.gradle
-    ndk: r21b
+    ndk: r21d
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
diff --git a/metadata/eu.faircode.netguard.yml b/metadata/eu.faircode.netguard.yml
index dfcf7b7d0a..835ef39fad 100644
--- a/metadata/eu.faircode.netguard.yml
+++ b/metadata/eu.faircode.netguard.yml
@@ -1238,7 +1238,7 @@ Builds:
     gradle:
       - yes
     prebuild: sed -i -e '/keystore/d' -e '/signingConfigs/d' build.gradle
-    ndk: r21b
+    ndk: r21d
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags ^[0-9.]+$
diff --git a/metadata/eu.siacs.conversations.yml b/metadata/eu.siacs.conversations.yml
index e6711f516c..51e8eb9007 100644
--- a/metadata/eu.siacs.conversations.yml
+++ b/metadata/eu.siacs.conversations.yml
@@ -1860,7 +1860,7 @@ Builds:
     prebuild: sed -i -e '/ExtraTranslation/aabortOnError\ false' -e '/libwebrtc/d'
         -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.30039'" -e
         '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
-    ndk: r21b
+    ndk: r21d
 
 MaintainerNotes: |-
     For 2.8.0 we replace the webrtc.aar with the latest M79 from maven, but
diff --git a/metadata/net.kollnig.missioncontrol.fdroid.yml b/metadata/net.kollnig.missioncontrol.fdroid.yml
index ecd2cb0604..fada139cbb 100644
--- a/metadata/net.kollnig.missioncontrol.fdroid.yml
+++ b/metadata/net.kollnig.missioncontrol.fdroid.yml
@@ -53,7 +53,7 @@ Builds:
     gradle:
       - fdroid
     prebuild: sed -i -e 's/21.0.6113669/21.1.6352462/' build.gradle
-    ndk: r21b
+    ndk: r21d
 
 AutoUpdateMode: Version %c
 UpdateCheckMode: Tags ^[0-9]+$
diff --git a/metadata/se.lublin.mumla.yml b/metadata/se.lublin.mumla.yml
index 5b27286ea0..4512286040 100644
--- a/metadata/se.lublin.mumla.yml
+++ b/metadata/se.lublin.mumla.yml
@@ -116,7 +116,7 @@ Builds:
       - gradle jar
     buildjni:
       - ../libraries/humla/src/main/jni
-    ndk: r21b
+    ndk: r21d
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags ^[^-]*$