From e4f4fcf98016669aa1a8c89de058692742266e32 Mon Sep 17 00:00:00 2001
From: Jeremi Kurdek <59935235+jkurdek@users.noreply.github.com>
Date: Wed, 4 Dec 2024 13:32:49 +0100
Subject: [PATCH 1/3] Bumped NDK version to 27

---
 src/azurelinux/3.0/net9.0/android/amd64/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/azurelinux/3.0/net9.0/android/amd64/Dockerfile b/src/azurelinux/3.0/net9.0/android/amd64/Dockerfile
index aa428825..fc02896b 100644
--- a/src/azurelinux/3.0/net9.0/android/amd64/Dockerfile
+++ b/src/azurelinux/3.0/net9.0/android/amd64/Dockerfile
@@ -1,5 +1,5 @@
 ARG ANDROID_SDK_ROOT=/usr/local/android-sdk
-ARG ANDROID_NDK_VERSION=23.2.8568313
+ARG ANDROID_NDK_VERSION=27.2.12479018
 ARG ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION
 FROM mcr.microsoft.com/openjdk/jdk:17-mariner AS android-sdk-download
 ARG ANDROID_SDK_ROOT

From d2eddd5e176f5e264440a4b04ac669e1a3e7bd8f Mon Sep 17 00:00:00 2001
From: Jeremi Kurdek <59935235+jkurdek@users.noreply.github.com>
Date: Thu, 5 Dec 2024 16:57:22 +0100
Subject: [PATCH 2/3] Remove clang-tidy deletion and update Python path

---
 src/azurelinux/3.0/net9.0/android/amd64/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/azurelinux/3.0/net9.0/android/amd64/Dockerfile b/src/azurelinux/3.0/net9.0/android/amd64/Dockerfile
index fc02896b..ddcd794a 100644
--- a/src/azurelinux/3.0/net9.0/android/amd64/Dockerfile
+++ b/src/azurelinux/3.0/net9.0/android/amd64/Dockerfile
@@ -27,8 +27,7 @@ RUN /usr/local/cmdline-tools/cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_
 
 # We can't upgrade the NDK version as the runtime repo requires tooling that only exists up to NDK 23
 # Remove all components of NDK 23 that are flagged by security scanners
-RUN rm -r ${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/python3/lib/python3.9/site-packages/ \
-    && rm -r ${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang-tidy
+RUN rm -r ${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/python3/lib/python3.11/site-packages/
 
 FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm-amd64
 

From 85dd40dc36fcc700cb24f821e6a38df8ad0be562 Mon Sep 17 00:00:00 2001
From: Jeremi Kurdek <59935235+jkurdek@users.noreply.github.com>
Date: Tue, 10 Dec 2024 18:57:21 +0100
Subject: [PATCH 3/3] Updated comment

---
 src/azurelinux/3.0/net9.0/android/amd64/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/azurelinux/3.0/net9.0/android/amd64/Dockerfile b/src/azurelinux/3.0/net9.0/android/amd64/Dockerfile
index ddcd794a..c7e76a15 100644
--- a/src/azurelinux/3.0/net9.0/android/amd64/Dockerfile
+++ b/src/azurelinux/3.0/net9.0/android/amd64/Dockerfile
@@ -25,8 +25,7 @@ RUN wget https://dl.google.com/android/repository/commandlinetools-linux-1107670
 RUN yes | /usr/local/cmdline-tools/cmdline-tools/bin/sdkmanager --licenses
 RUN /usr/local/cmdline-tools/cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --install "build-tools;33.0.0" "platforms;android-33" "ndk;${ANDROID_NDK_VERSION}"
 
-# We can't upgrade the NDK version as the runtime repo requires tooling that only exists up to NDK 23
-# Remove all components of NDK 23 that are flagged by security scanners
+# Remove all components of NDK that are flagged by security scanners
 RUN rm -r ${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/python3/lib/python3.11/site-packages/
 
 FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm-amd64