Toggle --incompatible_disable_late_bound_option_defaults flag.
In preparation of removing late bound option defaults.
RELNOTES: None.
PiperOrigin-RevId: 216698826
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
index 5f1b52b..afefc0b 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
@@ -882,7 +882,7 @@
@Option(
name = "incompatible_disable_late_bound_option_defaults",
- defaultValue = "false",
+ defaultValue = "true",
documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS},
metadataTags = {
diff --git a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java
index 4744d81..67c9c6b 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java
@@ -252,6 +252,7 @@
*/
@Test
public void lateBoundOptionDefaults() throws Exception {
+ useConfiguration("--incompatible_disable_late_bound_option_defaults=false");
scratch.file("test/BUILD",
"config_setting(",
" name = 'match',",
