Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset a36fe75347a1 (bug 1785174) for causing linting failures.

Browse Source
This commit is contained in:
Marian-Vasile Laza 2022-08-17 20:51:11 +03:00
parent fcae7ec6a6
commit 2dac282ab0
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
python/mozboot/mozboot/android.py
View File

@ -42,9 +42,9 @@ AVD_MANIFEST_X86_64 = Path(__file__).resolve().parent / "android-avds/x86_64.jso
AVD_MANIFEST_ARM = Path(__file__).resolve().parent / "android-avds/arm.json"
AVD_MANIFEST_ARM64 = Path(__file__).resolve().parent / "android-avds/arm64.json"
JAVA_VERSION_MAJOR = "18"
JAVA_VERSION_MINOR = "0.2"
JAVA_VERSION_PATCH = "9"
JAVA_VERSION_MAJOR = "17"
JAVA_VERSION_MINOR = "0.1"
JAVA_VERSION_PATCH = "12"
ANDROID_NDK_EXISTS = """
Looks like you have the correct version of the Android NDK installed at:
@ -836,8 +836,8 @@ def ensure_java(os_name, os_arch):
raise NotImplementedError(f"Could not bootstrap java for {os_name}.")
if not java_path.exists():
# e.g. https://github.com/adoptium/temurin18-binaries/releases/
# download/jdk-18.0.2+9/OpenJDK18U-jdk_x64_linux_hotspot_18.0.2_9.tar.gz
# e.g. https://github.com/adoptium/temurin17-binaries/releases/
# download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz
java_url = (
"https://github.com/adoptium/temurin{major}-binaries/releases/"
"download/jdk-{major}.{minor}%2B{patch}/"
@ -855,7 +855,7 @@ def ensure_java(os_name, os_arch):
def java_bin_path(os_name, toolchain_path: Path):
# Like jdk-18.0.2+9
# Like jdk-17.0.1+12
jdk_folder = "jdk-{major}.{minor}+{patch}".format(
major=JAVA_VERSION_MAJOR, minor=JAVA_VERSION_MINOR, patch=JAVA_VERSION_PATCH
)

2
python/mozbuild/mozbuild/test/configure/test_checks_configure.py
View File

@ -596,7 +596,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-18.0.2+9/bin, "
"ERROR: Could not locate Java at /mozbuild/jdk/jdk-17.0.1+12/bin, "
"please run ./mach bootstrap --no-system-changes\n"
)

2
taskcluster/ci/toolchain/android.yml
View File

@ -111,7 +111,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-18.0.2+9"
JAVA_HOME: "/builds/worker/fetches/jdk/jdk-17.0.1+12"
linux64-android-sdk-linux-repack:
description: "Android SDK (Linux) repack toolchain build"