Remove unnecessary flag from ProtoCcHeaderProvider.

--
PiperOrigin-RevId: 146502028
MOS_MIGRATED_REVID=146502028

2 files changed, 3 insertions, 16 deletions

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
index ea569e9425..7e2b8e6fbb 100644
--- 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
@@ -164,7 +164,7 @@ public class CcProtoAspect extends NativeAspectClass implements ConfiguredAspect
 
         NestedSetBuilder<Artifact> publicHeaderPaths = NestedSetBuilder.stableOrder();
         publicHeaderPaths.addAll(headers);
-        headerProvider = new ProtoCcHeaderProvider(publicHeaderPaths.build(), true);
+        headerProvider = new ProtoCcHeaderProvider(publicHeaderPaths.build());
       } else {
         // If this proto_library doesn't have sources, it provides the combined headers of all its
         // direct dependencies. Thus, if a direct dependency does have sources, the generated files
@@ -172,19 +172,13 @@ public class CcProtoAspect extends NativeAspectClass implements ConfiguredAspect
         // do the same thing, so that effectively this library looks through all source-less
         // proto_libraries and provides all generated headers of the proto_libraries with sources
         // that it depends on.
-        //
-        // Similar, if a proto_library, does not have sources, it forwards the information whether
-        // its transitive dependencies generated .pb.h files. If one of them doesn't, this
-        // proto_library pretends to not generate them either.
-        boolean hasDepWithoutPbH = false;
         NestedSetBuilder<Artifact> transitiveHeaders = NestedSetBuilder.stableOrder();
         for (ProtoCcHeaderProvider provider :
             ruleContext.getPrerequisites("deps", TARGET, ProtoCcHeaderProvider.class)) {
           helper.addPublicTextualHeaders(provider.getHeaders());
           transitiveHeaders.addTransitive(provider.getHeaders());
-          hasDepWithoutPbH = hasDepWithoutPbH || !provider.getGeneratesPbH();
         }
-        headerProvider = new ProtoCcHeaderProvider(transitiveHeaders.build(), !hasDepWithoutPbH);
+        headerProvider = new ProtoCcHeaderProvider(transitiveHeaders.build());
       }
 
       filesBuilder = NestedSetBuilder.stableOrder();
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/ProtoCcHeaderProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/ProtoCcHeaderProvider.java
index 5bf13de92e..e80bc7499f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/ProtoCcHeaderProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/ProtoCcHeaderProvider.java
@@ -21,11 +21,9 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 /** Provides information about generated C++ headers of dependencies. */
 public final class ProtoCcHeaderProvider implements TransitiveInfoProvider {
   private final NestedSet<Artifact> headers;
-  private final boolean generatesPbH;
 
-  public ProtoCcHeaderProvider(NestedSet<Artifact> headers, boolean generatesPbH) {
+  public ProtoCcHeaderProvider(NestedSet<Artifact> headers) {
     this.headers = headers;
-    this.generatesPbH = generatesPbH;
   }
 
   /**
@@ -36,9 +34,4 @@ public final class ProtoCcHeaderProvider implements TransitiveInfoProvider {
   public NestedSet<Artifact> getHeaders() {
     return headers;
   }
-
-  /** @return true, if this proto library generates .pb.h files. */
-  public boolean getGeneratesPbH() {
-    return generatesPbH;
-  }
 }