From 79f07450a769282c6f3c0d095311e19fbd072ee8 Mon Sep 17 00:00:00 2001
From: linsui <2873532-linsui@users.noreply.gitlab.com>
Date: Fri, 8 Apr 2022 08:50:03 +0000
Subject: [PATCH] blokada: enable 5.20.2

---
 metadata/org.blokada.fem.fdroid.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/metadata/org.blokada.fem.fdroid.yml b/metadata/org.blokada.fem.fdroid.yml
index 0ae346f761..a439c393c2 100644
--- a/metadata/org.blokada.fem.fdroid.yml
+++ b/metadata/org.blokada.fem.fdroid.yml
@@ -398,7 +398,6 @@ Builds:
 
   - versionName: 5.20.2
     versionCode: 520000002
-    disable: ndk r24
     commit: 67ab20824d120dc912406c8bb427c1c5db1e26b6
     subdir: android5/app
     submodules: true
@@ -412,6 +411,7 @@ Builds:
       - unzip -P default_blocklist src/main/assets/default_blocklist.zip default_blocklist
         -d src/main/assets
       - rm src/main/assets/default_blocklist.zip
+      - sed -i -e 's/24.0.7856742/24.0.8215888/' build.gradle
     build:
       - $$rustup$$/rustup-init.sh -y
       - source $HOME/.cargo/env
@@ -419,8 +419,12 @@ Builds:
       - rustup target add armv7-linux-androideabi
       - rustup target add aarch64-linux-android
       - cargo install cargo-ndk --version 1.0.0
-      - export ANDROID_NDK=$$NDK$$
       - cd ../..
+      - curl -Lo ndk.zip https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip
+      - echo "ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e ndk.zip"
+        | sha256sum -c -
+      - unzip -q ndk.zip
+      - export ANDROID_NDK=$(pwd)/android-ndk-r21e
       - ./build.boringtun.sh
       - ./build.blocka.sh
     ndk: r24