From 70a9a510e00ab0c34248ec00a5c5b9685ecaf88c Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Fri, 23 Aug 2024 11:23:36 +0200
Subject: [PATCH] More NDK r26d / DRY

---
 .docker/android_dev/Dockerfile |  6 +++---
 .github/workflows/android.yml  | 11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.docker/android_dev/Dockerfile b/.docker/android_dev/Dockerfile
index a7c0a20ad6..379803fdee 100644
--- a/.docker/android_dev/Dockerfile
+++ b/.docker/android_dev/Dockerfile
@@ -52,8 +52,8 @@ curl -o /android-sdk-10406996.zip https://dl.google.com/android/repository/comma
 curl -o /android-ndk-r25c-linux.zip https://dl.google.com/android/repository/android-ndk-r25c-linux.zip
 
 # Android NDK
-unzip /android-ndk-r25c-linux.zip
-rm -f android-ndk-r25c-linux.zip
+unzip /android-ndk-r26d-linux.zip
+rm -f android-ndk-r26d-linux.zip
 
 # Android SDK
 unzip /android-sdk-10406996.zip -d android-sdk
@@ -66,7 +66,7 @@ yes | /android-sdk/cmdline-tools/latest/bin/sdkmanager --licenses
 /android-sdk/cmdline-tools/latest/bin/sdkmanager "platforms;android-34" "build-tools;34.0.0" "platform-tools" "tools"
 END_OF_SCRIPT
 
-ENV ANDROID_NDK_HOME /android-ndk-r25c
+ENV ANDROID_NDK_HOME /android-ndk-r26d
 ENV ANDROID_SDK_ROOT /android-sdk
 
 WORKDIR /usr/src
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 0b25b68ed1..30e56e0025 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -76,13 +76,14 @@ jobs:
         id: vars
         shell: bash
         run: |
+          NDK_VERSION=26.3.11579264
           echo "JAVA_HOME=${JAVA_HOME_17_X64}" >> $GITHUB_ENV
-          echo "ANDROID_NDK_VERSION=26.3.11579264 " >> $GITHUB_ENV
-          echo "ANDROID_NDK=/usr/local/lib/android/sdk/ndk/26.3.11579264 " >> $GITHUB_ENV
-          echo "ANDROID_NDK_HOME=/usr/local/lib/android/sdk/ndk/26.3.11579264 " >> $GITHUB_ENV
-          echo "ANDROID_NDK_ROOT=/usr/local/lib/android/sdk/ndk/26.3.11579264 " >> $GITHUB_ENV
+          echo "ANDROID_NDK_VERSION=${NDK_VERSION}" >> $GITHUB_ENV
+          echo "ANDROID_NDK=/usr/local/lib/android/sdk/ndk/${NDK_VERSION}" >> $GITHUB_ENV
+          echo "ANDROID_NDK_HOME=/usr/local/lib/android/sdk/ndk/${NDK_VERSION}" >> $GITHUB_ENV
+          echo "ANDROID_NDK_ROOT=/usr/local/lib/android/sdk/ndk/${NDK_VERSION}" >> $GITHUB_ENV
           echo "ANDROID_BUILD_TOOLS_VERSION=34.0.0" >> $GITHUB_ENV
-          echo "ndk.dir=/usr/local/lib/android/sdk/ndk/26.3.11579264 " >> local.properties
+          echo "ndk.dir=/usr/local/lib/android/sdk/ndk/${NDK_VERSION}" >> local.properties
           ALL_FILES_ACCESS=${{ matrix.all_files_access }} ./scripts/ci/env_gh.sh
 
           BUILD_ROOT="/home/runner"