Update NDK to r28

Author: rvandermeulen

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## 🦊 What's Changed 🦊
 
+### Android
+- Upgraded NDK from r27c to r28. ([#6588](https://github.com/mozilla/application-services/pull/6588))
+
 ### Glean
 - Updated to v63.1.0 ([#6584](https://github.com/mozilla/application-services/pull/6584))
 

build.gradle

@@ -2,7 +2,7 @@
 
 buildscript {
     ext.build = [
-        ndkVersion: "27.2.12479018", // Keep it in sync in TC Dockerfile.
+        ndkVersion: "28.0.13004108", // Keep it in sync in TC Dockerfile.
 
         // In general, we should aim to keep these in sync with AC
         compileSdkVersion: 35,

components/support/rc_crypto/nss/nss_build_common/src/lib.rs

@@ -92,13 +92,13 @@ 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 = "27.2.12479018";
+        const ANDROID_NDK_VERSION: &str = "28.0.13004108";
         // 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/18/lib/linux/";
+            "/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/19/lib/linux/";
         println!("cargo:rustc-link-search={android_home}/ndk/{ANDROID_NDK_VERSION}/{DARWIN_X86_64_LIB_DIR}");
         const LINUX_X86_64_LIB_DIR: &str =
-            "/toolchains/llvm/prebuilt/linux-x86_64/lib/clang/18/lib/linux/";
+            "/toolchains/llvm/prebuilt/linux-x86_64/lib/clang/19/lib/linux/";
         println!("cargo:rustc-link-search={android_home}/ndk/{ANDROID_NDK_VERSION}/{LINUX_X86_64_LIB_DIR}");
         println!("cargo:rustc-link-lib=static=clang_rt.builtins-x86_64-android");
     }

docs/building.md

@@ -108,7 +108,7 @@ The following instructions assume that you are building `application-services` f
    1. Configure the required versions of NDK
   `Configure menu > System Settings > Android SDK > SDK Tools > NDK > Show Package Details > NDK (Side by side)`
         - 27.0.12077973 (required by Fenix; note: a specific NDK version isn't configured, this maps to default [NDK version](https://developer.android.com/studio/projects/install-ndk#default-ndk-per-agp) for the [AGP version](https://searchfox.org/mozilla-central/source/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt#33))
-        - 27.2.12479018 (required by Application Services, [as configured](https://github.com/mozilla/application-services/blob/main/build.gradle#L33))
+        - 28.0.13004108 (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

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/27.2.12479018"
+    export NDK_ROOT="$HOME/Library/Android/sdk/ndk/28.0.13004108"
     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"

taskcluster/docker/linux/Dockerfile

@@ -19,10 +19,10 @@ WORKDIR /builds/worker/
 
 # Configuration
 
-ENV ANDROID_BUILD_TOOLS "35.0.0"
+ENV ANDROID_BUILD_TOOLS "35.0.1"
 ENV ANDROID_TOOLS_VERSION "12700392"
 ENV ANDROID_PLATFORM_VERSION "35"
-ENV ANDROID_NDK_VERSION "27.2.12479018"
+ENV ANDROID_NDK_VERSION "28.0.13004108"
 
 # Set up the language variables to avoid problems (we run locale-gen later).
 ENV LANG en_US.UTF-8