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

RELNOTES: None
PiperOrigin-RevId: 164335492

1 files changed, 14 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
index 2661bdbb28..53f361ce0f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
@@ -30,6 +30,7 @@ import com.google.devtools.common.options.EnumConverter;
 import com.google.devtools.common.options.Option;
 import com.google.devtools.common.options.OptionDocumentationCategory;
 import com.google.devtools.common.options.OptionEffectTag;
+import com.google.devtools.common.options.OptionMetadataTag;
 import com.google.devtools.common.options.TriState;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
@@ -493,6 +494,17 @@ public class JavaOptions extends FragmentOptions {
   )
   public OneVersionEnforcementLevel enforceOneVersion;
 
+  @Option(
+    name = "jplPropagateCcLinkParamsStore",
+    defaultValue = "false",
+    category = "rollout",
+    documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
+    effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOADING_AND_ANALYSIS},
+    metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
+    help = "Roll-out flag for making java_proto_library propagate CcLinkParamsStore. DO NOT USE."
+  )
+  public boolean jplPropagateCcLinkParamsStore;
+
   @Override
   public FragmentOptions getHost(boolean fallback) {
     JavaOptions host = (JavaOptions) getDefault();
@@ -518,6 +530,8 @@ public class JavaOptions extends FragmentOptions {
 
     host.enforceOneVersion = enforceOneVersion;
 
+    host.jplPropagateCcLinkParamsStore = jplPropagateCcLinkParamsStore;
+
     return host;
   }