From 6cb90b82b9faf39a9f05a2018ba0cf85712687bc Mon Sep 17 00:00:00 2001
From: kaipi <kaipi@google.com>
Date: Wed, 1 May 2019 09:16:31 -0700
Subject: [PATCH] Flip the --incompatible_disable_objc_provider_resources flag
 to true by default.

See #5710 for more info.

RELNOTES: --incompatible_disable_objc_provider_resources is now enabled by default.
PiperOrigin-RevId: 246142200
---
 .../devtools/build/lib/packages/StarlarkSemanticsOptions.java   | 2 +-
 .../com/google/devtools/build/lib/syntax/StarlarkSemantics.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
index 8b349793e7f4b8..b288956bf5f083 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -212,7 +212,7 @@ public class StarlarkSemanticsOptions extends OptionsBase implements Serializabl
 
   @Option(
       name = "incompatible_disable_objc_provider_resources",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
       effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
       metadataTags = {
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
index 5b1909fc2dcc04..779ee1914068c8 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
@@ -230,7 +230,7 @@ public static Builder builderWithDefaults() {
           .incompatibleDepsetUnion(true)
           .incompatibleDisableThirdPartyLicenseChecking(true)
           .incompatibleDisableDeprecatedAttrParams(false)
-          .incompatibleDisableObjcProviderResources(false)
+          .incompatibleDisableObjcProviderResources(true)
           .incompatibleDisallowDictPlus(true)
           .incompatibleDisallowFileType(true)
           .incompatibleDisallowLegacyJavaProvider(false)