From b1fc2187b069fc9fbd80322bbbac133053b96165 Mon Sep 17 00:00:00 2001
From: Noa Resare <noa@resare.com>
Date: Sat, 13 Aug 2022 16:52:04 +0100
Subject: [PATCH] Add references to jdk 17 and 18 for linux-aarch64

Closes #14937
---
 distdir_deps.bzl                              | 28 +++++++++++++++++++
 .../devtools/build/lib/bazel/rules/java/BUILD |  2 +-
 .../lib/bazel/rules/java/jdk.WORKSPACE.tmpl   | 22 +++++++++++++++
 tools/jdk/BUILD.tools                         |  2 +-
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/distdir_deps.bzl b/distdir_deps.bzl
index 14a077989aa547..8e22959622dd7f 100644
--- a/distdir_deps.bzl
+++ b/distdir_deps.bzl
@@ -589,6 +589,20 @@ DIST_DEPS = {
         ],
         "used_in": [],
     },
+    "remotejdk17_linux_aarch64": {
+        "aliases": [
+            "remotejdk17_linux_aarch64_for_testing",
+            "openjdk17_linux_aarch64_archive",
+        ],
+        "archive": "zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz",
+        "sha256": "2b8066bbdbc5cff422bb6b6db1b8f8d362b576340cce8492f1255502af632b06",
+        "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-linux_aarch64",
+        "urls": [
+            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz",
+            "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz",
+        ],
+        "used_in": ["test_WORKSPACE_files"],
+    },
     "remotejdk17_macos": {
         "aliases": [
             "remotejdk17_macos_for_testing",
@@ -628,6 +642,20 @@ DIST_DEPS = {
         ],
         "used_in": [],
     },
+    "remotejdk18_linux_aarch64": {
+        "aliases": [
+            "remotejdk18_linux_for_testing",
+            "openjdk18_linux_archive",
+        ],
+        "archive": "zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz",
+        "sha256": "a1d5f78172f32f819d08e9043b0f82fa7af738b37c55c6ca8d6092c61d204d53",
+        "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-linux_aarch64",
+        "urls": [
+            "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz",
+            "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz",
+        ],
+        "used_in": ["test_WORKSPACE_files"],
+    },
     "remotejdk18_linux": {
         "aliases": [
             "remotejdk18_linux_for_testing",
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BUILD
index 6eef4a2f5f7214..db866b2e8e76e4 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BUILD
@@ -104,7 +104,7 @@ gen_workspace_stanza(
         "remotejdk11_win_arm64",
     ] + [
         "remotejdk%s_%s" % (version, os)
-        for os in ("macos", "macos_aarch64", "linux", "win", "win_arm64")
+        for os in ("macos", "macos_aarch64", "linux", "linux_aarch64", "win", "win_arm64")
         for version in ("17", "18")
     ],
     template = "jdk.WORKSPACE.tmpl",
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.tmpl b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.tmpl
index 5972a03e091661..e4132727095c69 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.tmpl
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.tmpl
@@ -116,6 +116,17 @@ maybe(
     version = "17",
 )
 
+# This must be kept in sync with the top-level WORKSPACE file.
+maybe(
+    remote_java_repository,
+    {remotejdk17_linux_aarch64}
+    target_compatible_with = [
+        "@platforms//os:linux",
+        "@platforms//cpu:aarch64",
+    ],
+    version = "17",
+)
+
 # This must be kept in sync with the top-level WORKSPACE file.
 maybe(
     remote_java_repository,
@@ -170,6 +181,17 @@ maybe(
     version = "18",
 )
 
+# This must be kept in sync with the top-level WORKSPACE file.
+maybe(
+    remote_java_repository,
+    {remotejdk18_linux_aarch64}
+    target_compatible_with = [
+        "@platforms//os:linux",
+        "@platforms//cpu:aarch64",
+    ],
+    version = "18",
+)
+
 # This must be kept in sync with the top-level WORKSPACE file.
 maybe(
     remote_java_repository,
diff --git a/tools/jdk/BUILD.tools b/tools/jdk/BUILD.tools
index c8a35e20cfea0c..a8bb7c78899595 100644
--- a/tools/jdk/BUILD.tools
+++ b/tools/jdk/BUILD.tools
@@ -421,7 +421,7 @@ _JDKS = [
     "remotejdk11_linux_s390x",
 ] + [
     "remotejdk%s_%s" % (version, os)
-    for os in ("linux", "macos", "macos_aarch64", "win", "win_arm64")
+    for os in ("linux", "linux_aarch64", "macos", "macos_aarch64", "win", "win_arm64")
     for version in ("17", "18")
 ]