Flip --incompatible_blacklisted_protos_requires_proto_info

Fixes bazelbuild#11694 Closes bazelbuild#12037. PiperOrigin-RevId: 340230616
databricks · Nov 2, 2020 · 53705f6 · 53705f6
1 parent e79e7e8
commit 53705f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
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
@@ -171,7 +171,7 @@ public static class Options extends FragmentOptions {
 
     @Option(
         name = "incompatible_blacklisted_protos_requires_proto_info",
-        defaultValue = "false",
+        defaultValue = "true",
         documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
         effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
         metadataTags = {

diff --git a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java
@@ -142,6 +142,9 @@ public void protoToolchainBlacklistTransitiveProtos() throws Exception {
 
   @Test
   public void protoToolchainMixedBlacklist() throws Exception {
+    // Tests legacy behaviour.
+    useConfiguration("--incompatible_blacklisted_protos_requires_proto_info=false");
+
     scratch.file(
         "third_party/x/BUILD",
         TestConstants.LOAD_PROTO_LIBRARY,