From 9bcc6258dfcb3546c25d9fac4947d1263f93b781 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Mon, 28 Jul 2025 21:30:50 -0400
Subject: [PATCH] Update NDK to r28c

---
 CHANGELOG.md                                                 | 3 +++
 components/support/rc_crypto/nss/nss_build_common/src/lib.rs | 2 +-
 docs/building.md                                             | 2 +-
 docs/howtos/locally-building-jna.md                          | 2 +-
 settings.gradle                                              | 2 +-
 taskcluster/docker/linux/Dockerfile                          | 2 +-
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 350e1cd261..039adf8e1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## 🦊 What's Changed 🦊
 
+### Android
+- Upgraded NDK from r28b to r28c. ([#6848](https://github.com/mozilla/application-services/pull/6848))
+
 ### Logins
 - Updated logins verification telemetry so it can be used in iOS([#6832](https://github.com/mozilla/application-services/pull/6832))
 
diff --git a/components/support/rc_crypto/nss/nss_build_common/src/lib.rs b/components/support/rc_crypto/nss/nss_build_common/src/lib.rs
index 569fe01dbe..e098a0bebb 100644
--- a/components/support/rc_crypto/nss/nss_build_common/src/lib.rs
+++ b/components/support/rc_crypto/nss/nss_build_common/src/lib.rs
@@ -92,7 +92,7 @@ fn link_nss_libs(kind: LinkingKind) {
     let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap();
     if target_arch == "x86_64" && target_os == "android" {
         let android_home = env::var("ANDROID_HOME").expect("ANDROID_HOME not set");
-        const ANDROID_NDK_VERSION: &str = "28.1.13356709";
+        const ANDROID_NDK_VERSION: &str = "28.2.13676358";
         // One of these will exist, depending on the host platform.
         const DARWIN_X86_64_LIB_DIR: &str =
             "/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/19/lib/linux/";
diff --git a/docs/building.md b/docs/building.md
index e8c1ed9f08..2c26fbac30 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -107,7 +107,7 @@ The following instructions assume that you are building `application-services` f
    1. Set `ANDROID_SDK_ROOT` and `ANDROID_HOME` to the Android Studio sdk location and add it to your rc file (either `.zshrc` or `.bashrc` depending on the shell you use for your terminal).
    1. Configure the required versions of NDK
   `Configure menu > System Settings > Android SDK > SDK Tools > NDK > Show Package Details > NDK (Side by side)`
-        - 28.1.13356709 (required by Application Services, [as configured](https://github.com/mozilla/application-services/blob/main/build.gradle#L33))
+        - 28.2.13676358 (required by Application Services, [as configured](https://github.com/mozilla/application-services/blob/main/build.gradle#L33))
 1. If you are on Windows using WSL - drop to the section below, [Windows setup
 for Android (WSL)](building.md#windows-setup-for-android-via-wsl) before proceeding.
 1. Check dependencies, environment variables
diff --git a/docs/howtos/locally-building-jna.md b/docs/howtos/locally-building-jna.md
index 0ab7ba4ff1..0df263f8ed 100644
--- a/docs/howtos/locally-building-jna.md
+++ b/docs/howtos/locally-building-jna.md
@@ -17,7 +17,7 @@ Here are the steps that worked for me:
   for each target platform are in your `$PATH`. On my Mac with Android Studio the
   config was as follows:
     ```
-    export NDK_ROOT="$HOME/Library/Android/sdk/ndk/28.1.13356709"
+    export NDK_ROOT="$HOME/Library/Android/sdk/ndk/28.2.13676358"
     export NDK_PLATFORM="$NDK_ROOT/platforms/android-25"
     export PATH="$PATH:$NDK_ROOT/toolchains/llvm/prebuilt/darwin-x86_64/bin"
     export PATH="$PATH:$NDK_ROOT/toolchains/aarch64-linux-android-4.9/prebuilt/darwin-x86_64/bin"
diff --git a/settings.gradle b/settings.gradle
index 3d8a5e6176..096879b43f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -178,7 +178,7 @@ gradle.projectsLoaded { ->
             36, // compileSdkVersion,
             21, // minSdkVersion,
             36, // targetSdkVersion,
-            "28.1.13356709", // ndkVersion - Keep it in sync in TC Dockerfile.
+            "28.2.13676358", // ndkVersion - Keep it in sync in TC Dockerfile.
         )
     }
 }
diff --git a/taskcluster/docker/linux/Dockerfile b/taskcluster/docker/linux/Dockerfile
index c41add2b06..407c5d4e0d 100644
--- a/taskcluster/docker/linux/Dockerfile
+++ b/taskcluster/docker/linux/Dockerfile
@@ -22,7 +22,7 @@ WORKDIR /builds/worker/
 ENV ANDROID_BUILD_TOOLS "36.0.0"
 ENV ANDROID_TOOLS_VERSION "13114758"
 ENV ANDROID_PLATFORM_VERSION "36"
-ENV ANDROID_NDK_VERSION "28.1.13356709"
+ENV ANDROID_NDK_VERSION "28.2.13676358"
 
 # Set up the language variables to avoid problems (we run locale-gen later).
 ENV LANG en_US.UTF-8