Prepare to remove support for files in proto_lang_toolchain.blacklisted_protos

cushon · copybara-github · commit 01df1e5c3aaf · 2020-01-03T10:54:15.000-08:00
PiperOrigin-RevId: 288016010
diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchain.java
@@ -41,11 +41,12 @@ public ConfiguredTarget create(RuleContext ruleContext)
     NestedSetBuilder<Artifact> blacklistedProtos = NestedSetBuilder.stableOrder();
     for (TransitiveInfoCollection protos :
         ruleContext.getPrerequisites("blacklisted_protos", TARGET)) {
-      blacklistedProtos.addTransitive(protos.getProvider(FileProvider.class).getFilesToBuild());
       ProtoInfo protoInfo = protos.get(ProtoInfo.PROVIDER);
       // TODO(cushon): it would be nice to make this mandatory and stop adding files to build too
       if (protoInfo != null) {
-        blacklistedProtos.addAll(protoInfo.getDirectProtoSources());
+        blacklistedProtos.addTransitive(protoInfo.getTransitiveProtoSources());
+      } else {
+        blacklistedProtos.addTransitive(protos.getProvider(FileProvider.class).getFilesToBuild());
       }
     }
 
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockJ2ObjcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockJ2ObjcSupport.java
@@ -94,10 +94,10 @@ public static void setup(MockToolsConfig config) throws IOException {
         "    runtime = '//third_party/java/j2objc:proto_runtime',",
         ")",
         "exports_files(['j2objc_deploy.jar'])",
-        "filegroup(",
+        "proto_library(",
         "    name = 'j2objc_proto_blacklist',",
-        "    srcs = [",
-        "        '" + TestConstants.TOOLS_REPOSITORY + "//tools/j2objc/proto:blacklisted.proto'",
+        "    deps = [",
+        "        '" + TestConstants.TOOLS_REPOSITORY + "//tools/j2objc/proto:blacklisted'",
         "    ])");
 
     config.create(
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockProtoSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockProtoSupport.java
@@ -87,7 +87,7 @@ private static void createNetProto2(MockToolsConfig config) throws IOException {
     config.create(
         "java/com/google/protobuf/BUILD",
         "package(default_visibility=['//visibility:public'])",
-        "filegroup(name = 'protobuf_proto_sources', srcs = [])");
+        "proto_library(name = 'protobuf_proto_sources', srcs = [])");
 
     // RPC generator plugins.
     config.create("net/rpc/compiler/BUILD",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
@@ -1043,7 +1043,7 @@ public void testProtoToolchainForJ2ObjcFlag() throws Exception {
         "    name = 'j2objc_wrapper',",
         "    srcs = ['j2objc_wrapper.py'],",
         ")",
-        "filegroup(",
+        "proto_library(",
         "    name = 'blacklisted_protos',",
         "    srcs = ['some_blacklisted_proto.proto'],",
         ")",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java
@@ -35,6 +35,7 @@ public class ProtoLangToolchainTest extends BuildViewTestCase {
   @Before
   public void setUp() throws Exception {
     MockProtoSupport.setupWorkspace(scratch);
+    MockProtoSupport.setup(mockToolsConfig);
     invalidatePackages();
   }
 
@@ -45,7 +46,8 @@ public void protoToolchain() throws Exception {
         "cc_binary(name = 'plugin', srcs = ['plugin.cc'])",
         "cc_library(name = 'runtime', srcs = ['runtime.cc'])",
         "filegroup(name = 'descriptors', srcs = ['metadata.proto', 'descriptor.proto'])",
-        "filegroup(name = 'any', srcs = ['any.proto'])");
+        "filegroup(name = 'any', srcs = ['any.proto'])",
+        "proto_library(name = 'blacklist', srcs = [':descriptors', ':any'])");
 
     scratch.file(
         "foo/BUILD",
@@ -55,7 +57,7 @@ public void protoToolchain() throws Exception {
         "    command_line = 'cmd-line',",
         "    plugin = '//x:plugin',",
         "    runtime = '//x:runtime',",
-        "    blacklisted_protos = ['//x:descriptors', '//x:any']",
+        "    blacklisted_protos = ['//x:blacklist']",
         ")");
 
     update(ImmutableList.of("//foo:toolchain"), false, 1, true, new EventBus());

Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,12 @@ public ConfiguredTarget create(RuleContext ruleContext)`
`41`	`41`	`NestedSetBuilder<Artifact> blacklistedProtos = NestedSetBuilder.stableOrder();`
`42`	`42`	`for (TransitiveInfoCollection protos :`
`43`	`43`	`ruleContext.getPrerequisites("blacklisted_protos", TARGET)) {`
`44`		`- blacklistedProtos.addTransitive(protos.getProvider(FileProvider.class).getFilesToBuild());`
`45`	`44`	`ProtoInfo protoInfo = protos.get(ProtoInfo.PROVIDER);`
`46`	`45`	`// TODO(cushon): it would be nice to make this mandatory and stop adding files to build too`
`47`	`46`	`if (protoInfo != null) {`
`48`		`- blacklistedProtos.addAll(protoInfo.getDirectProtoSources());`
	`47`	`+ blacklistedProtos.addTransitive(protoInfo.getTransitiveProtoSources());`
	`48`	`+ } else {`
	`49`	`+ blacklistedProtos.addTransitive(protos.getProvider(FileProvider.class).getFilesToBuild());`
`49`	`50`	`}`
`50`	`51`	`}`
`51`	`52`