XLinfini/sousa-gecko
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 2071614 - Update JDK 17 to version 17.0.20.1+1. r=firefox-build-system-reviewers,ahochheiden

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D325616
This commit is contained in:
Ryan VanderMeulen
2026-09-12 19:50:46 +00:00
committed by rvandermeulen@mozilla.com
parent 7c24ec4123
commit 73d0b06bfb
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/mozboot/mozboot/android.py
+4 -4
View File
@@ -52,8 +52,8 @@ AVD_HOME_PATH = Path(
)
JAVA_VERSION_MAJOR = "17"
JAVA_VERSION_MINOR = "0.18"
JAVA_VERSION_PATCH = "8"
JAVA_VERSION_MINOR = "0.20.1"
JAVA_VERSION_PATCH = "1"
ANDROID_NDK_EXISTS = """
Looks like you have the correct version of the Android NDK installed at:
@@ -914,7 +914,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.18%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.18_8.tar.gz
# download/jdk-17.0.20.1%2B1/OpenJDK17U-jdk_x64_linux_hotspot_17.0.20.1_1.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}/"
@@ -990,7 +990,7 @@ def ensure_gradle_jdk_installations(
def get_java_bin_path(os_name: str, toolchain_path: Path):
# Like jdk-17.0.18+8
# Like jdk-17.0.20.1+1
jdk_folder = f"jdk-{JAVA_VERSION_MAJOR}.{JAVA_VERSION_MINOR}+{JAVA_VERSION_PATCH}"
java_path = toolchain_path / "jdk" / jdk_folder
python/mozbuild/mozbuild/test/configure/test_checks_configure.py
+1 -1
View File
@@ -592,7 +592,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.18+8/bin, "
"ERROR: Could not locate Java at /mozbuild/jdk/jdk-17.0.20.1+1/bin, "
"please run ./mach bootstrap --no-system-changes\n"
)
taskcluster/kinds/toolchain/android.yml
+1 -1
View File
@@ -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.18+8"
JAVA_HOME: "/builds/worker/fetches/jdk/jdk-17.0.20.1+1"
linux64-android-sdk-linux-repack:
description: "Android SDK (Linux) repack toolchain build"