From 972e73efbc5572d8d2427c476c424690708fd933 Mon Sep 17 00:00:00 2001
From: plf <plf@google.com>
Date: Fri, 1 Mar 2019 02:00:30 -0800
Subject: [PATCH] C++: Flips default to True for
 --incompatible_disable_legacy_cc_provider

Tracking issue: #7036

RELNOTES:none
PiperOrigin-RevId: 236281588
---
 .../com/google/devtools/build/lib/rules/cpp/CppOptions.java | 2 +-
 src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD | 1 +
 .../build/lib/rules/cpp/CcSkylarkApiProviderTest.java       | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
index 6e6415c767ebe9..23c990421f6a6a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
@@ -826,7 +826,7 @@ public Label getFdoPrefetchHintsLabel() {
 
   @Option(
       name = "incompatible_disable_legacy_cc_provider",
-      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/cpp/BUILD b/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD
index f81cf55b820a30..83418af01c32ea 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD
@@ -17,6 +17,7 @@ java_test(
         exclude = [
             "CcImportBaseConfiguredTargetTest.java",
             "SkylarkCcCommonTestHelper.java",
+            "CcSkylarkApiProviderTest.java",
         ],
     ) + ["proto/CcProtoLibraryTest.java"],
     resources = [
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcSkylarkApiProviderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcSkylarkApiProviderTest.java
index ec4ffed863552b..a05c610ccebe40 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcSkylarkApiProviderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcSkylarkApiProviderTest.java
@@ -19,6 +19,7 @@
 import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -33,6 +34,11 @@ private CcSkylarkApiProvider getApi(String label) throws Exception {
     return (CcSkylarkApiProvider) rule.get(CcSkylarkApiProvider.NAME);
   }
 
+  @Before
+  public final void setConfiguration() throws Exception {
+    useConfiguration("--incompatible_disable_legacy_cc_provider=false");
+  }
+
   @Test
   public void testDisableInCcLibrary() throws Exception {
     useConfiguration("--incompatible_disable_legacy_cc_provider");