objc_proto_library does not pick up generated cc code in compile actions.

PiperOrigin-RevId: 152169986

1 files changed, 15 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java
index 83eb0ff321..3154b16a34 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java
@@ -300,6 +300,7 @@ public final class CcLibraryHelper {
   private CcToolchainProvider ccToolchain;
   private final FdoSupportProvider fdoSupport;
   private String linkedArtifactNameSuffix = "";
+  private boolean useDeps = true;
 
   /**
    * Creates a CcLibraryHelper.
@@ -912,6 +913,15 @@ public final class CcLibraryHelper {
   }
 
   /**
+   * Causes actions generated from this CcLibraryHelper not to use build semantics (includes,
+   * headers, srcs) from dependencies.
+   */
+  public CcLibraryHelper doNotUseDeps() {
+    this.useDeps = false;
+    return this;
+  }
+
+  /**
    * Create the C++ compile and link actions, and the corresponding C++-related providers.
    *
    * @throws RuleErrorException
@@ -1318,9 +1328,11 @@ public final class CcLibraryHelper {
       contextBuilder.addIncludeDir(publicHeaders.getVirtualIncludePath());
     }
 
-    contextBuilder.mergeDependentContexts(
-        AnalysisUtils.getProviders(deps, CppCompilationContext.class));
-    contextBuilder.mergeDependentContexts(depContexts);
+    if (useDeps) {
+      contextBuilder.mergeDependentContexts(
+          AnalysisUtils.getProviders(deps, CppCompilationContext.class));
+      contextBuilder.mergeDependentContexts(depContexts);
+    }
     CppHelper.mergeToolchainDependentContext(ruleContext, ccToolchain, contextBuilder);
 
     // But defines come after those inherited from deps.