From 3847844c54277880321f70f45fbe17695eba3f8e Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 28 Sep 2022 15:31:08 +0200
Subject: [PATCH] Update android_ndk to version r21e

To do this, we need to update the android api to 24.
We lost all users using a android under api 24.
---
 kiwixbuild/dependencies/android_ndk.py | 9 +++++----
 kiwixbuild/platforms/android.py        | 4 ++--
 kiwixbuild/versions.py                 | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/kiwixbuild/dependencies/android_ndk.py b/kiwixbuild/dependencies/android_ndk.py
index fb38a03..88cad29 100644
--- a/kiwixbuild/dependencies/android_ndk.py
+++ b/kiwixbuild/dependencies/android_ndk.py
@@ -10,11 +10,12 @@ class android_ndk(Dependency):
     neutral = False
     name = 'android-ndk'
     gccver = '4.9.x'
+    api = '24'
 
     class Source(ReleaseDownload):
-        archive = Remotefile('android-ndk-r13b-linux-x86_64.zip',
-                             '3524d7f8fca6dc0d8e7073a7ab7f76888780a22841a6641927123146c3ffd29c',
-                             'https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip')
+        archive = Remotefile('android-ndk-r21e-linux-x86_64.zip',
+                             'ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e',
+                             'https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip')
 
         @property
         def source_dir(self):
@@ -28,7 +29,7 @@ class android_ndk(Dependency):
 
         @property
         def api(self):
-            return '21' if self.arch in ('arm64', 'x86_64') else '14'
+            return self.target.api
 
         @property
         def platform(self):
diff --git a/kiwixbuild/platforms/android.py b/kiwixbuild/platforms/android.py
index 43e3a4f..e38133f 100644
--- a/kiwixbuild/platforms/android.py
+++ b/kiwixbuild/platforms/android.py
@@ -20,8 +20,8 @@ class AndroidPlatformInfo(PlatformInfo):
     def binaries_name(self):
         arch_full = self.arch_full
         return {
-          'CC': '{}-{}'.format(arch_full, 'gcc'),
-          'CXX': '{}-{}'.format(arch_full, 'g++'),
+          'CC': '{}-{}'.format(arch_full, 'clang'),
+          'CXX': '{}-{}'.format(arch_full, 'clang++'),
           'AR': '{}-{}'.format(arch_full, 'ar'),
           'STRIP': '{}-{}'.format(arch_full, 'strip'),
           'RANLIB': '{}-{}'.format(arch_full, 'ranlib'),
diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py
index 4a2e555..19b2a49 100644
--- a/kiwixbuild/versions.py
+++ b/kiwixbuild/versions.py
@@ -39,7 +39,7 @@ release_versions = {
 
 # This is the "version" of the whole base_deps_versions dict.
 # Change this when you change base_deps_versions.
-base_deps_meta_version = '77'
+base_deps_meta_version = '78'
 
 base_deps_versions = {
   'zlib' : '1.2.12',
@@ -55,7 +55,7 @@ base_deps_versions = {
   'icu4c' : '58.2',
   'libaria2' : '1.36.0',
   'libmagic' : '5.35',
-  'android-ndk' : 'r13b',
+  'android-ndk' : 'r21e',
   'qt' : '5.10.1',
   'qtwebengine' : '5.10.1',
   'org.kde' : '5.15-21.08',