Turn off C++ provider propagation from java_proto_library, until J2ObjcAspect ignores them.

RELNOTES: None
PiperOrigin-RevId: 164335492

1 files changed, 6 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java
index 9b331f2f1c..faaf5d0e06 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java
@@ -163,6 +163,7 @@ public final class JavaConfiguration extends Fragment {
   private final Label javaToolchain;
   private final boolean explicitJavaTestDeps;
   private final boolean experimentalTestRunner;
+  private final boolean jplPropagateCcLinkParamsStore;
 
   // TODO(dmarting): remove once we have a proper solution for #2539
   private final boolean legacyBazelJavaTest;
@@ -194,6 +195,7 @@ public final class JavaConfiguration extends Fragment {
     this.enforceOneVersion = javaOptions.enforceOneVersion;
     this.explicitJavaTestDeps = javaOptions.explicitJavaTestDeps;
     this.experimentalTestRunner = javaOptions.experimentalTestRunner;
+    this.jplPropagateCcLinkParamsStore = javaOptions.jplPropagateCcLinkParamsStore;
 
     ImmutableList.Builder<Label> translationsBuilder = ImmutableList.builder();
     for (String s : javaOptions.translationTargets) {
@@ -414,4 +416,8 @@ public final class JavaConfiguration extends Fragment {
   public boolean strictDepsJavaProtos() {
     return strictDepsJavaProtos;
   }
+
+  public boolean jplPropagateCcLinkParamsStore() {
+    return jplPropagateCcLinkParamsStore;
+  }
 }