From 1f1e8145d0ad478d50846d39d26c4241a0453919 Mon Sep 17 00:00:00 2001
From: Benjamin Deroche <benjdero@gmail.com>
Date: Mon, 26 Sep 2022 14:47:05 +0200
Subject: [PATCH] Problem: Default Android NDK version is not aligned with
 zproject

Solution: Set NDK r25 as the default. No compatiblity changes required.
---
 builds/android/README.md               | 6 +++---
 builds/android/android_build_helper.sh | 4 ++--
 builds/android/build.sh                | 2 +-
 builds/android/ci_build.sh             | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/builds/android/README.md b/builds/android/README.md
index 83c9a72e..0acf228a 100644
--- a/builds/android/README.md
+++ b/builds/android/README.md
@@ -5,12 +5,12 @@
 You need the Android Native Development Kit (NDK) installed. See
 [here](https://developer.android.com/ndk) to download it.
 
-This project is tested against Android NDK version r24.
+This project is tested against Android NDK version r25.
 
-If you installed version r24 all you have to do is to expose the NDK root
+If you installed version r25 all you have to do is to expose the NDK root
 directory as environment variable, e.g:
 
-    export ANDROID_NDK_ROOT=$HOME/android-ndk-r24
+    export ANDROID_NDK_ROOT=$HOME/android-ndk-r25
 
 If you installed another version you have to expose the NDK root directory as
 well as the NDK version, e.g:
diff --git a/builds/android/android_build_helper.sh b/builds/android/android_build_helper.sh
index 72720cd9..91e9be82 100644
--- a/builds/android/android_build_helper.sh
+++ b/builds/android/android_build_helper.sh
@@ -112,12 +112,12 @@ function android_build_env {
 
     if [ -z "$ANDROID_NDK_ROOT" ]; then
         ANDROID_BUILD_FAIL+=("Please set the ANDROID_NDK_ROOT environment variable")
-        ANDROID_BUILD_FAIL+=("  (eg. \"/home/user/android/android-ndk-r24\")")
+        ANDROID_BUILD_FAIL+=("  (eg. \"/home/user/android/android-ndk-r25\")")
     fi
 
     if [ -z "$TOOLCHAIN_PATH" ]; then
         ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_PATH environment variable")
-        ANDROID_BUILD_FAIL+=("  (eg. \"/home/user/android/android-ndk-r24/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin\")")
+        ANDROID_BUILD_FAIL+=("  (eg. \"/home/user/android/android-ndk-r25/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin\")")
     fi
 
     if [ -z "$TOOLCHAIN_HOST" ]; then
diff --git a/builds/android/build.sh b/builds/android/build.sh
index 10270e45..3c7c8711 100755
--- a/builds/android/build.sh
+++ b/builds/android/build.sh
@@ -34,7 +34,7 @@ case $(uname | tr '[:upper:]' '[:lower:]') in
 esac
 
 # Set default values used in ci builds
-export NDK_VERSION=${NDK_VERSION:-android-ndk-r24}
+export NDK_VERSION=${NDK_VERSION:-android-ndk-r25}
 # With NDK r22b, the minimum SDK version range is [16, 31].
 # Since NDK r24, the minimum SDK version range is [19, 31].
 # SDK version 21 is the minimum version for 64-bit builds.
diff --git a/builds/android/ci_build.sh b/builds/android/ci_build.sh
index e6ef08e7..8769dacf 100755
--- a/builds/android/ci_build.sh
+++ b/builds/android/ci_build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-export NDK_VERSION=android-ndk-r24
+export NDK_VERSION=android-ndk-r25
 export ANDROID_NDK_ROOT="/tmp/${NDK_VERSION}"
 
 case $(uname | tr '[:upper:]' '[:lower:]') in