From cca5779216a22cd30857da2cf1da6c7e344919dc Mon Sep 17 00:00:00 2001
From: hlopko <hlopko@google.com>
Date: Fri, 29 Mar 2019 06:55:34 -0700
Subject: [PATCH] Flip --incompatible_disable_legacy_cc_provider

Fixes https://github.com/bazelbuild/bazel/issues/7036.

RELNOTES: Incompatible flag `--incompatible_disable_legacy_cc_provider` has been flipped (see https://github.com/bazelbuild/bazel/issues/7036 for details).
PiperOrigin-RevId: 240971173
---
 .../com/google/devtools/build/lib/rules/cpp/CppOptions.java   | 2 +-
 .../build/lib/rules/cpp/CcSkylarkApiProviderTest.java         | 4 ++++
 2 files changed, 5 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 11a5aa06ceb8de..eaf0659ab6f821 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
@@ -833,7 +833,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/CcSkylarkApiProviderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcSkylarkApiProviderTest.java
index ec4ffed863552b..826576f9a7c3bc 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
@@ -90,6 +90,7 @@ public void testDisableInCcProtoLibrary() throws Exception {
 
   @Test
   public void testTransitiveHeaders() throws Exception {
+    useConfiguration("--noincompatible_disable_legacy_cc_provider");
     scratch.file(
         "pkg/BUILD",
         "cc_binary(",
@@ -109,6 +110,7 @@ public void testTransitiveHeaders() throws Exception {
 
   @Test
   public void testLinkFlags() throws Exception {
+    useConfiguration("--noincompatible_disable_legacy_cc_provider");
     scratch.file(
         "pkg/BUILD",
         "cc_binary(",
@@ -145,6 +147,7 @@ public void testLinkFlags() throws Exception {
 
   @Test
   public void testLibraries() throws Exception {
+    useConfiguration("--noincompatible_disable_legacy_cc_provider");
     scratch.file(
         "pkg/BUILD",
         "cc_binary(",
@@ -170,6 +173,7 @@ public void testLibraries() throws Exception {
 
   @Test
   public void testCcFlags() throws Exception {
+    useConfiguration("--noincompatible_disable_legacy_cc_provider");
     scratch.file(
         "pkg/BUILD",
         "cc_binary(",