From 3b475b322643bf026251daa19018ac425ff6e689 Mon Sep 17 00:00:00 2001
From: hvd <hvadehra@gmail.com>
Date: Thu, 16 Mar 2023 07:28:55 -0700
Subject: [PATCH] Create separate java_tools for darwin_x86_64 and darwin_arm64

This is step 2 of https://github.com/bazelbuild/bazel/issues/17780

Closes #17782.

PiperOrigin-RevId: 517115859
Change-Id: I300dadf405f233514486b294970adadf2a7a1602
---
 src/BUILD                        | 3 ++-
 src/create_java_tools_release.sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/BUILD b/src/BUILD
index a8b9e4dd29eb20..15ee2d090a2289 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -537,7 +537,8 @@ sh_binary(
         "tmp/build",
         "--platform",
     ] + select({
-        "//src/conditions:darwin": ["darwin"],
+        "//src/conditions:darwin_x86_64": ["darwin_x86_64"],
+        "//src/conditions:darwin_arm64": ["darwin_arm64"],
         "//src/conditions:windows": ["windows"],
         "//src/conditions:linux": ["linux"],
         "//conditions:default": ["unknown"],
diff --git a/src/create_java_tools_release.sh b/src/create_java_tools_release.sh
index 92dca4e3337e19..e223e5c9a7cd07 100755
--- a/src/create_java_tools_release.sh
+++ b/src/create_java_tools_release.sh
@@ -69,7 +69,7 @@ trap "rm -fr $tmp_dir" EXIT
 
 gcs_bucket="gs://bazel-mirror/bazel_java_tools"
 
-for platform in "linux" "windows" "darwin"; do
+for platform in "linux" "windows" "darwin_x86_64" "darwin_arm64"; do
   rc_url="release_candidates/java/v${java_tools_version}/java_tools_${platform}-v${java_tools_version}-rc${rc}.zip"
 
   if [[ $release == "true" ]]; then