Flip --incompatible_disable_legacy_cc_provider

Fixes #7036. RELNOTES: Incompatible flag `--incompatible_disable_legacy_cc_provider` has been flipped (see #7036 for details). PiperOrigin-RevId: 240971173
bazelbuild · Mar 29, 2019 · cca5779 · cca5779
1 parent 0f41b9e
commit cca5779
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 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
@@ -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
@@ -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(",