1 files changed, 18 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java
index daf8e48812..d36504b0f0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java
@@ -167,6 +167,19 @@ public class ProtoConfiguration extends Fragment {
     )
     public boolean correctRollupTransitiveProtoRuntimes;
 
+    @Option(
+      name = "jplNonStrictDepsLikePl",
+      defaultValue = "false",
+      category = "rollout",
+      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
+      effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOADING_AND_ANALYSIS},
+      metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
+      help =
+          "Roll-out flag for changing behavior of non-strict java_xxx_proto_library. "
+              + "See commit description for details. DO NOT USE."
+    )
+    public boolean jplNonStrictDepsLikePl;
+
     @Override
     public FragmentOptions getHost(boolean fallback) {
       Options host = (Options) super.getHost(fallback);
@@ -181,6 +194,7 @@ public class ProtoConfiguration extends Fragment {
       host.ccProtoLibraryHeaderSuffixes = ccProtoLibraryHeaderSuffixes;
       host.ccProtoLibrarySourceSuffixes = ccProtoLibrarySourceSuffixes;
       host.correctRollupTransitiveProtoRuntimes = correctRollupTransitiveProtoRuntimes;
+      host.jplNonStrictDepsLikePl = jplNonStrictDepsLikePl;
       return host;
     }
   }
@@ -262,4 +276,8 @@ public class ProtoConfiguration extends Fragment {
   public boolean correctRollupTransitiveProtoRuntimes() {
     return options.correctRollupTransitiveProtoRuntimes;
   }
+
+  public boolean jplNonStrictDepsLikePl() {
+    return options.jplNonStrictDepsLikePl;
+  }
 }