commit 3b475b322643bf026251daa19018ac425ff6e689
author hvd <hvadehra@gmail.com> Thu Mar 16 07:28:55 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Mar 16 07:31:55 2023 -0700
tree 18b2bc6674de1e9777ad6cae1d3044725ffa20cc
parent 36c167ba78788de750041af2cb643018f4215dcc

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

diff --git a/src/BUILD b/src/BUILD
index a8b9e4d..15ee2d0 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -537,7 +537,8 @@
         "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"],

src/create_java_tools_release.sh

diff --git a/src/create_java_tools_release.sh b/src/create_java_tools_release.sh
index 92dca4e..e223e5c 100755
--- a/src/create_java_tools_release.sh
+++ b/src/create_java_tools_release.sh
@@ -69,7 +69,7 @@
 
 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