commit afacc9cb688ce0198b1708222b219f0158bf1418
author Ivo List <ilist@google.com> Wed Nov 04 06:27:05 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Nov 04 06:28:07 2020 -0800
tree e5069a3f0c1ecad97a7add5ecc417de5a2979705
parent 65e818e65b4a8720a2dc3a15750d6d83bd961ed2

Use selects based on constraint_values in java_tools.

This makes them consistent with platformization which works on OS and CPU constraints from @platforms.

Flag --cpu=darwin maps on Bazel to macos+x86_64, internally --cpu=darwin_x86_64 is used. With platforms, those become a single config_setting.

I didn't combine together other darwin config_settings (dropping cpu), because of possible combination macos+ppc.

Closes #12410.

PiperOrigin-RevId: 340636557

tools/jdk/BUILD.java_tools

diff --git a/tools/jdk/BUILD.java_tools b/tools/jdk/BUILD.java_tools
index 8e13b4b..17d0989 100644
--- a/tools/jdk/BUILD.java_tools
+++ b/tools/jdk/BUILD.java_tools
@@ -326,43 +326,38 @@
 
 config_setting(
     name = "linux_x86_64",
-    values = {"cpu": "k8"},
-)
-
-config_setting(
-    name = "darwin",
-    values = {"cpu": "darwin"},
+    constraint_values = [ "@platforms//os:linux", "@platforms//cpu:x86_64" ],
 )
 
 config_setting(
     name = "darwin_x86_64",
-    values = {"cpu": "darwin_x86_64"},
+    constraint_values = [ "@platforms//os:macos", "@platforms//cpu:x86_64" ],
 )
 
 config_setting(
     name = "darwin_arm64",
-    values = {"cpu": "darwin_arm64"},
+    constraint_values = [ "@platforms//os:macos", "@platforms//cpu:arm64" ],
 )
 
 config_setting(
     name = "darwin_arm64e",
-    values = {"cpu": "darwin_arm64e"},
+    constraint_values = [ "@platforms//os:macos", "@platforms//cpu:arm64e" ],
 )
 
 config_setting(
     name = "windows",
-    values = {"cpu": "x64_windows"},
+    constraint_values = [ "@platforms//os:windows" ],
 )
 
 config_setting(
     name = "freebsd",
-    values = {"cpu": "freebsd"},
+    constraint_values = [ "@platforms//os:freebsd" ],
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "openbsd",
-    values = {"cpu": "openbsd"},
+    constraint_values = [ "@platforms//os:openbsd" ],
     visibility = ["//visibility:public"],
 )
 
@@ -378,7 +373,6 @@
     name = "singlejar_prebuilt_or_cc_binary",
     actual = select({
         ":linux_x86_64": "java_tools/src/tools/singlejar/singlejar_local",
-        ":darwin": "java_tools/src/tools/singlejar/singlejar_local",
         ":darwin_x86_64": "java_tools/src/tools/singlejar/singlejar_local",
         ":darwin_arm64": "java_tools/src/tools/singlejar/singlejar_local",
         ":darwin_arm64e": "java_tools/src/tools/singlejar/singlejar_local",
@@ -407,7 +401,6 @@
     name = "prebuilt_binary_or_cc_binary",
     actual = select({
         ":linux_x86_64": ":ijar_prebuilt_binary",
-        ":darwin": ":ijar_prebuilt_binary",
         ":darwin_x86_64": ":ijar_prebuilt_binary",
         ":darwin_arm64": ":ijar_prebuilt_binary",
         ":darwin_arm64e": ":ijar_prebuilt_binary",