When building remotely on Windows, use the Java version of singlejar, not the native one, since the native one doesn't work yet.
Work to make the native version work tracked at https://github.com/bazelbuild/bazel/issues/2241
This is needed to run singlejar for remote builds on Windows successfully.
RELNOTES: N/A
PiperOrigin-RevId: 210105718
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index 378b527..04eaee3 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -93,11 +93,23 @@
filegroup(
name = "singlejar",
srcs = select({
- "//src/conditions:remote": ["//src/tools/singlejar:singlejar"],
+ "//src/conditions:remote": [":singlejar_remote"],
"//conditions:default": glob(["singlejar/*"]),
}),
)
+# This is a separate filegroup from :singlejar above since Bazel doesn't
+# support nested selects (we need a logical "remote AND windows" condition).
+filegroup(
+ name = "singlejar_remote",
+ srcs = select({
+ # TODO(jsharpe): Switch to //src/tools/singlejar:singlejar once
+ # native singlejar works on Windows.
+ "//src/conditions:windows": glob(["singlejar/*"]),
+ "//conditions:default": ["//src/tools/singlejar:singlejar"],
+ }),
+)
+
filegroup(
name = "genclass",
srcs = ["//tools/jdk:GenClass_deploy.jar"],
