[singlejar] Enable native singlejar on Windows
See #2241
Closes #6608.
PiperOrigin-RevId: 220267534
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index b1a2c21..461ea32 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -106,23 +106,11 @@
filegroup(
name = "singlejar",
srcs = select({
- "//src/conditions:remote": [":singlejar_remote"],
+ "//src/conditions:remote": ["//src/tools/singlejar:singlejar"],
"//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"],
