Update Android NDK & SDK to the latest releases

.circleci/config.yml

@@ -113,8 +113,8 @@ commands:
           name: Install missing Android SDK & NDK
           command: |
             sdkmanager \
-              "build-tools;34.0.0" \
-              "ndk;26.2.11394342"
+              "build-tools;35.0.0" \
+              "ndk;27.0.12077973"
 
   android-setup:
     steps:
@@ -416,7 +416,7 @@ jobs:
 
   Lint Android with ktlint and detekt:
     docker:
-      - image: cimg/android:2024.01.1-browsers
+      - image: cimg/android:2024.07.1-browsers
     steps:
       - checkout
       - android-setup
@@ -426,7 +426,7 @@ jobs:
 
   Android tests:
     docker:
-      - image: cimg/android:2024.01.1-browsers
+      - image: cimg/android:2024.07.1-browsers
     steps:
       - checkout
       - skip-if-doc-only

CHANGELOG.md

@@ -12,6 +12,7 @@
   * Default-enable `delayPingLifetimeIo` ([#2863](https://github.com/mozilla/glean/issues/2863))
   * Preparing Glean to be able to remove `service-glean` from Android Components ([#2891](https://github.com/mozilla/glean/pull/2891))
   * Gradle Plugin: Support for using an external Python environment ([#2889](https://github.com/mozilla/glean/pull/2889))
+  * Upgrade Android NDK to r27 ([#2903](https://github.com/mozilla/glean/pull/2903))
 * Rust
   * New Metric Types: `labeled_custom_distribution`, `labeled_memory_distribution`, and `labeled_timing_distribution` ([bug 1657947](https://bugzilla.mozilla.org/show_bug.cgi?id=1657947))
 

build.gradle

@@ -8,7 +8,7 @@
 
 buildscript {
     ext.build = [
-        ndkVersion: "26.2.11394342", // Keep it in sync in TC Dockerfile.
+        ndkVersion: "27.0.12077973", // Keep it in sync in TC Dockerfile.
         compileSdkVersion: 34,
         targetSdkVersion: 34,
         minSdkVersion: 21,

docs/dev/android/sdk-ndk-versions.md

@@ -2,13 +2,13 @@
 
 The Glean SDK implementation is currently build against the following versions:
 
-* SDK API 34
-    * Look for `android-34` in the SDK manager
-    * or install with: `sdkmanager --verbose "platforms;android-34"`
+* SDK API 35
+    * Look for `android-35` in the SDK manager
+    * or install with: `sdkmanager --verbose "platforms;android-35"`
 * Android Command line tools
     * Download link: <https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip>
-* NDK r26
-    * Download link: <https://dl.google.com/android/repository/android-ndk-r26c-linux.zip>
+* NDK r27
+    * Download link: <https://dl.google.com/android/repository/android-ndk-r27-linux.zip>
 
 For the full setup see [Setup the Android Build Environment](setup-android-build-environment.html).
 
@@ -20,10 +20,10 @@ All locations need to be updated on upgrades:
     * `dev/android/setup-android-build-environment.md`
 * CI configuration
     * `.circleci/config.yml`
-        * `sdkmanager 'build-tools;34.0.0'`
-        * `image: circleci/android:2024.01.1-browsers`
+        * `sdkmanager 'build-tools;35.0.0'`
+        * `image: circleci/android:2024.07.1-browsers`
     * `taskcluster/docker/linux/Dockerfile`.
-        * `ENV ANDROID_BUILD_TOOLS "34.0.0"`
+        * `ENV ANDROID_BUILD_TOOLS "35.0.0"`
         * `ENV ANDROID_SDK_VERSION "11076708"`
-        * `ENV ANDROID_PLATFORM_VERSION "34"`
-        * `ENV ANDROID_NDK_VERSION "26.2.11394342"`
+        * `ENV ANDROID_PLATFORM_VERSION "35"`
+        * `ENV ANDROID_NDK_VERSION "27.0.12077973"`

taskcluster/docker/linux/Dockerfile

@@ -22,10 +22,10 @@ WORKDIR /builds/worker/
 
 # Configuration
 
-ENV ANDROID_BUILD_TOOLS "34.0.0"
+ENV ANDROID_BUILD_TOOLS "35.0.0"
 ENV ANDROID_TOOLS_VERSION "11076708"
-ENV ANDROID_PLATFORM_VERSION "34"
-ENV ANDROID_NDK_VERSION "26.2.11394342"
+ENV ANDROID_PLATFORM_VERSION "35"
+ENV ANDROID_NDK_VERSION "27.0.12077973"
 
 # Set up the language variables to avoid problems (we run locale-gen later).
 ENV LANG en_US.UTF-8