Make proto blacklisting work when virtual import directories are present.

lberki · copybara-github · commit 46c95dcbe288 · 2019-07-11T02:50:48.000-07:00
This fixes the fallout from ce65de4 . Afterparty for #7157. RELNOTES: None. PiperOrigin-RevId: 257573726
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java
@@ -269,7 +269,7 @@ private static class Impl {
     private boolean areSrcsBlacklisted() {
       return !new ProtoSourceFileBlacklist(
               ruleContext, getProtoToolchainProvider().blacklistedProtos())
-          .checkSrcs(protoInfo.getDirectProtoSources(), "cc_proto_library");
+          .checkSrcs(protoInfo.getOriginalDirectProtoSources(), "cc_proto_library");
     }
 
     private FeatureConfiguration getFeatureConfiguration() {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java
@@ -511,6 +511,7 @@ public static ProtoInfo createProtoInfo(
     ProtoInfo protoInfo =
         new ProtoInfo(
             library.getSources(),
+            directProtoSources,
             library.getSourceRoot(),
             transitiveProtoSources,
             transitiveProtoSourceRoots,
diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoInfo.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoInfo.java
@@ -52,6 +52,7 @@ public Provider() {
   public static final String LEGACY_SKYLARK_NAME = "proto";
 
   private final ImmutableList<Artifact> directProtoSources;
+  private final ImmutableList<Artifact> originalDirectProtoSources;
   private final String directProtoSourceRoot;
   private final NestedSet<Artifact> transitiveProtoSources;
   private final NestedSet<String> transitiveProtoSourceRoots;
@@ -68,6 +69,7 @@ public Provider() {
   @AutoCodec.Instantiator
   public ProtoInfo(
       ImmutableList<Artifact> directProtoSources,
+      ImmutableList<Artifact> originalDirectProtoSources,
       String directProtoSourceRoot,
       NestedSet<Artifact> transitiveProtoSources,
       NestedSet<String> transitiveProtoSourceRoots,
@@ -82,6 +84,7 @@ public ProtoInfo(
       Location location) {
     super(PROVIDER, location);
     this.directProtoSources = directProtoSources;
+    this.originalDirectProtoSources = originalDirectProtoSources;
     this.directProtoSourceRoot = directProtoSourceRoot;
     this.transitiveProtoSources = transitiveProtoSources;
     this.transitiveProtoSourceRoots = transitiveProtoSourceRoots;
@@ -96,12 +99,21 @@ public ProtoInfo(
     this.transitiveDescriptorSets = transitiveDescriptorSets;
   }
 
-  /** The proto sources of the {@code proto_library} declaring this provider. */
+  /**
+   * The proto source files that are used in compiling this {@code proto_library}.
+   *
+   * <p>Different from {@link #getOriginalDirectProtoSources()} when a virtual import root is used.
+   */
   @Override
   public ImmutableList<Artifact> getDirectProtoSources() {
     return directProtoSources;
   }
 
+  /** The proto sources of the {@code proto_library} declaring this provider. */
+  public ImmutableList<Artifact> getOriginalDirectProtoSources() {
+    return originalDirectProtoSources;
+  }
+
   /** The source root of the current library. */
   @Override
   public String getDirectProtoSourceRoot() {
diff --git a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilderTest.java b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilderTest.java
@@ -64,6 +64,7 @@ private ProtoInfo protoInfo(
       NestedSet<Pair<Artifact, String>> strictImportableProtos,
       NestedSet<Pair<Artifact, String>> exportedProtos) {
     return new ProtoInfo(
+        directProtos,
         directProtos,
         "",
         transitiveProtos,

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ private static class Impl {`
`269`	`269`	`private boolean areSrcsBlacklisted() {`
`270`	`270`	`return !new ProtoSourceFileBlacklist(`
`271`	`271`	`ruleContext, getProtoToolchainProvider().blacklistedProtos())`
`272`		`- .checkSrcs(protoInfo.getDirectProtoSources(), "cc_proto_library");`
	`272`	`+ .checkSrcs(protoInfo.getOriginalDirectProtoSources(), "cc_proto_library");`
`273`	`273`	`}`
`274`	`274`
`275`	`275`	`private FeatureConfiguration getFeatureConfiguration() {`