can we just use the plugin one?

Author: peterebden

test/build_defs/BUILD

@@ -12,8 +12,8 @@ filegroup(
     name = "build_defs",
     srcs = ["test.build_defs"],
     visibility = [
-        "//test/...",
         "//src/test/...",
+        "//test/...",
     ],
 )
 
@@ -25,12 +25,6 @@ filegroup(
     ],
 )
 
-filegroup(
-    name = "cc_embed_binary",
-    srcs = ["cc_embed_binary.build_defs"],
-    visibility = ["//test/..."],
-)
-
 # Used for some of the parse tests that want a subinclude that isn't visible to them.
 filegroup(
     name = "not_visible",

test/build_defs/cc_embed_binary.build_defs

@@ -1,7 +1,7 @@
 # This contains an arbitrary set of rules intended to exercise
 # aspects of the cross-compilation code.
 
-subinclude("//test/build_defs:cc_embed_binary", "///cc//build_defs:c")
+subinclude("///cc//build_defs:c", "///cc//build_defs:cc_embed_binary")
 
 go_binary(
     name = "generator",