From 228a381ea336c67c3a9c300eccf26cc62bd82cb1 Mon Sep 17 00:00:00 2001
From: Gregor MacLennan <gmaclennan@digital-democracy.org>
Date: Fri, 12 Feb 2021 14:22:44 +0000
Subject: [PATCH] chore: Fix Github CI builds by removing NDK r22 (#516)

See #517 for explanation
An update to the Github Action virtual environment added NDK r22,
which CMake uses, ignoring $ANDROID_NDK_HOME.
Solution: Remove NDK r22 and update to latest NDK r21f
---
 .github/workflows/android.yml | 3 +++
 android/build.gradle          | 2 +-
 bitrise.yml                   | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index d88c653be..6392b52d8 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -37,6 +37,9 @@ jobs:
       #     mv android-ndk-r${ANDROID_NDK_VERSION} $ANDROID_NDK_HOME
       #     ls -al $ANDROID_NDK_HOME
       #     cat $ANDROID_NDK_HOME/source.properties
+      - name: Delete newer NDK version
+        run: |
+          rm -rf $ANDROID_HOME/ndk/22*
       - name: Download Android Emulator Image
         run: |
           sdkmanager --update | grep -v = || true
diff --git a/android/build.gradle b/android/build.gradle
index fac3f85a1..246be67c1 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         supportLibVersion = "29.0.0"
         // Kotlin is needed by Detox testing framework
         kotlinVersion = "1.3.50"
-        ndkVersion = "21.3.6528147"
+        ndkVersion = "21.4.7075529"
     }
     repositories {
         google()
diff --git a/bitrise.yml b/bitrise.yml
index d924b3c2e..2e3174f24 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -283,11 +283,13 @@ workflows:
                 # debug log
                 set -x
 
-                ANDROID_NDK_VERSION='21.3.6528147'
+                ANDROID_NDK_VERSION='21.4.7075529'
 
                 echo '### User Sources for Android SDK Manager' > $HOME/.android/repositories.cfg
                 yes | sdkmanager --licenses
                 sdkmanager --update | grep -v = || true
+                # Remove NDK r22 (can cause builds to fail)
+                rm -rf $ANDROID_HOME/ndk/22*
                 sdkmanager --install "ndk;${ANDROID_NDK_VERSION}"
 
                 echo "Updated to latest SDK:"