Support proto_library in proto_lang_toolchain.blacklisted_protos

cushon · copybara-github · commit a5ee2c4d9794 · 2019-04-08T10:49:56.000-07:00
in addition to output files.

PiperOrigin-RevId: 242492558
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
@@ -28,6 +28,7 @@
 import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.Runfiles;
 import com.google.devtools.build.lib.analysis.RunfilesProvider;
+import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.syntax.Type;
 
@@ -37,9 +38,14 @@ public class ProtoLangToolchain implements RuleConfiguredTargetFactory {
   public ConfiguredTarget create(RuleContext ruleContext)
       throws InterruptedException, RuleErrorException, ActionConflictException {
     NestedSetBuilder<Artifact> blacklistedProtos = NestedSetBuilder.stableOrder();
-    for (FileProvider protos :
-        ruleContext.getPrerequisites("blacklisted_protos", TARGET, FileProvider.class)) {
-      blacklistedProtos.addTransitive(protos.getFilesToBuild());
+    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());
+      }
     }
 
     return new RuleConfiguredTargetBuilder(ruleContext)
