tor-browser

commit 7cdd12a7c320e8ae31c261e1af31d80071e4a1e4
parent 3d2a502ca24e0f38d99cbd6a769310d13c71d7e7
Author: Lando <lando@lando.test>
Date:   Mon,  3 Nov 2025 21:55:52 +0000

Merge mozilla-central to autoland

Diffstat:
M
python/mozboot/mozboot/android.py
 | 
8
++++----
M
python/mozbuild/mozbuild/test/configure/test_checks_configure.py
 | 
2
+-
M
taskcluster/kinds/toolchain/android.yml
 | 
2
+-

3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/python/mozboot/mozboot/android.py b/python/mozboot/mozboot/android.py
@@ -48,8 +48,8 @@ AVD_HOME_PATH = Path(
 )
 
 JAVA_VERSION_MAJOR = "17"
-JAVA_VERSION_MINOR = "0.17"
-JAVA_VERSION_PATCH = "10"
+JAVA_VERSION_MINOR = "0.16"
+JAVA_VERSION_PATCH = "8"
 
 ANDROID_NDK_EXISTS = """
 Looks like you have the correct version of the Android NDK installed at:
@@ -891,7 +891,7 @@ def ensure_java(os_name: str, os_arch: str):
         ext = "zip" if os_name == "windows" else "tar.gz"
 
         # e.g. https://github.com/adoptium/temurin17-binaries/releases/
-        #      download/jdk-17.0.17%2B10/OpenJDK17U-jdk_x64_linux_hotspot_17.0.17_10.tar.gz
+        #      download/jdk-17.0.16%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.16_8.tar.gz
         java_url = (
             f"https://github.com/adoptium/temurin{JAVA_VERSION_MAJOR}-binaries/releases/"
             f"download/jdk-{JAVA_VERSION_MAJOR}.{JAVA_VERSION_MINOR}%2B{JAVA_VERSION_PATCH}/"
@@ -901,7 +901,7 @@ def ensure_java(os_name: str, os_arch: str):
 
 
 def get_java_bin_path(os_name: str, toolchain_path: Path):
-    # Like jdk-17.0.17+10
+    # Like jdk-17.0.16+8
     jdk_folder = f"jdk-{JAVA_VERSION_MAJOR}.{JAVA_VERSION_MINOR}+{JAVA_VERSION_PATCH}"
 
     java_path = toolchain_path / "jdk" / jdk_folder
diff --git a/python/mozbuild/mozbuild/test/configure/test_checks_configure.py b/python/mozbuild/mozbuild/test/configure/test_checks_configure.py
@@ -593,7 +593,7 @@ class TestChecksConfigure(unittest.TestCase):
         javac = mozpath.abspath("/usr/bin/javac")
         paths = {java: None, javac: None}
         expected_error_message = (
-            "ERROR: Could not locate Java at /mozbuild/jdk/jdk-17.0.17+10/bin, "
+            "ERROR: Could not locate Java at /mozbuild/jdk/jdk-17.0.16+8/bin, "
             "please run ./mach bootstrap --no-system-changes\n"
         )
 
diff --git a/taskcluster/kinds/toolchain/android.yml b/taskcluster/kinds/toolchain/android.yml
@@ -193,7 +193,7 @@ linux64-jdk-repack:
         toolchain-artifact: project/gecko/jdk/jdk-linux.tar.zst
         toolchain-alias: linux64-jdk
         toolchain-env:
-            JAVA_HOME: "/builds/worker/fetches/jdk/jdk-17.0.17+10"
+            JAVA_HOME: "/builds/worker/fetches/jdk/jdk-17.0.16+8"
 
 linux64-android-sdk-linux-repack:
     description: "Android SDK (Linux) repack toolchain build"