From ec48b699be6fb080ee6e9996cec2730848920284 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Wed, 1 Nov 2023 08:23:24 +1000
Subject: [PATCH] Update NDK in docs/scripts

---
 .github/workflows/update_gradle_wrapper.yml | 2 +-
 README.md                                   | 8 ++++----
 build-rust.gradle                           | 2 +-
 rsdroid/build.gradle                        | 2 +-
 tools/doctor.sh                             | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/update_gradle_wrapper.yml b/.github/workflows/update_gradle_wrapper.yml
index 85ffb8b92..d53453aae 100644
--- a/.github/workflows/update_gradle_wrapper.yml
+++ b/.github/workflows/update_gradle_wrapper.yml
@@ -29,7 +29,7 @@ jobs:
     # COULD_BE_BETTER: Consider turning this into a GitHub action - help the wider community
     # NDK install (unzipping) is really noisy - silence the log spam with grep, while keeping errors
     - name: Install NDK (silent)
-      run: .github/scripts/install_ndk.sh 25.2.9519653
+      run: .github/scripts/install_ndk.sh 26.1.10909125
 
     - name: Update Gradle Wrapper
       uses: gradle-update/update-gradle-wrapper-action@v1
diff --git a/README.md b/README.md
index 6c0e1c669..7d6b8905b 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ and put it on your path.
 In Android Studio, choose the Tools>SDK Manager menu option.
 
 - In SDK tools, enable "show package details"
-- Choose NDK version 25.2.9519653.
+- Choose NDK version 26.1.10909125.
 - After downloading, you may need to restart Android Studio to get it to
 synchronize gradle.
 
@@ -89,19 +89,19 @@ eg on Linux:
 
 ```
 export ANDROID_SDK_ROOT=$HOME/Android/Sdk
-export ANDROID_NDK_HOME=$HOME/Android/Sdk/ndk/25.2.9519653
+export ANDROID_NDK_HOME=$HOME/Android/Sdk/ndk/26.1.10909125
 ```
 
 Or macOS:
 
 ```
 export ANDROID_SDK_ROOT=$HOME/Library/Android/sdk
-export ANDROID_NDK_HOME=$HOME/Library/Android/sdk/ndk/25.2.9519653
+export ANDROID_NDK_HOME=$HOME/Library/Android/sdk/ndk/26.1.10909125
 ```
 Or Windows using Powershell:
 
 ```
-$env:ANDROID_NDK_HOME="$env:ANDROID_SDK_ROOT\ndk\25.2.9519653"
+$env:ANDROID_NDK_HOME="$env:ANDROID_SDK_ROOT\ndk\26.1.10909125"
 ```
 If you don't have Java installed, you may be able to use the version bundled
 with Android Studio. Eg on macOS:
diff --git a/build-rust.gradle b/build-rust.gradle
index 84ae02593..01b68f0d3 100644
--- a/build-rust.gradle
+++ b/build-rust.gradle
@@ -2,7 +2,7 @@ task buildRust(type: Exec) {
     // ensure script doesn't try to start gradle again
     environment 'RUNNING_FROM_GRADLE', '1'
     if (!System.getenv('ANDROID_NDK_HOME')) {
-        String ndkPath = "${getSdkDir()}/ndk/25.2.9519653"
+        String ndkPath = "${getSdkDir()}/ndk/26.1.10909125"
         environment 'ANDROID_NDK_HOME', ndkPath
     }
     workingDir "$rootDir"
diff --git a/rsdroid/build.gradle b/rsdroid/build.gradle
index c0de2efe1..88e3f094c 100644
--- a/rsdroid/build.gradle
+++ b/rsdroid/build.gradle
@@ -20,7 +20,7 @@ def getAnkiCommitHash = { ->
 android {
     namespace 'net.ankiweb.rsdroid'
     compileSdk rootProject.ext.compileSdk
-    ndkVersion "25.2.9519653" // Used by GitHub actions - avoids an install step on some machines
+    ndkVersion "26.1.10909125" // Used by GitHub actions - avoids an install step on some machines
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
diff --git a/tools/doctor.sh b/tools/doctor.sh
index 0cc5d66df..6866cd99a 100755
--- a/tools/doctor.sh
+++ b/tools/doctor.sh
@@ -2,7 +2,7 @@
 
 set -e # Error out if there were any problems
 
-ANDROID_NDK_VERSION="25.2.9519653"
+ANDROID_NDK_VERSION="26.1.10909125"
 
 red=31
 green=32