Automated rollback of commit 972e73e.

*** Reason for rollback *** Breaking project downstream. *** Original change description *** C++: Flips default to True for --incompatible_disable_legacy_cc_provider Tracking issue: #7036 RELNOTES:none PiperOrigin-RevId: 236320142
bazelbuild · Mar 1, 2019 · c19a161 · c19a161
1 parent 32295e0
commit c19a161
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
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
@@ -826,7 +826,7 @@ public Label getFdoPrefetchHintsLabel() {
 
   @Option(
       name = "incompatible_disable_legacy_cc_provider",
-      defaultValue = "true",
+      defaultValue = "false",
       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
@@ -17,7 +17,6 @@ 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
@@ -19,7 +19,6 @@
 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;
@@ -34,11 +33,6 @@ 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");