1 files changed, 15 insertions, 9 deletions
diff --git a/src/BUILD b/src/BUILD
index d1ef9366fd..d2431844fb 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -173,7 +173,18 @@ py_binary(
         "//conditions:default": [
             "//src/tools/singlejar:singlejar",
         ],
-    }) + (select({
+    }) + ([":embedded_jdk"] if (suffix == "_with_jdk") else []),
+    visibility = [
+        "//src/test:__subpackages__",  # For integration tests
+    ],
+) for suffix in [
+    "",
+    "_with_jdk",
+]]
+
+filegroup(
+    name = "embedded_jdk",
+    srcs = select({
         "//src/conditions:darwin": [
             "@openjdk_macos//file",
         ],
@@ -186,14 +197,9 @@ py_binary(
         "//conditions:default": [
             "@openjdk_linux//file",
         ],
-    }) if (suffix == "_with_jdk") else []),
-    visibility = [
-        "//src/test:__subpackages__",  # For integration tests
-    ],
-) for suffix in [
-    "",
-    "_with_jdk",
-]]
+    }),
+    visibility = ["//src/test/shell/bazel:__pkg__"],
+)
 
 [srcsfile(
     name = "embedded_tools" + suffix + "_params",