Enable --incompatible_expand_directories by default. Fixes #6762 RELNOTES: --incompatible_expand_directories is enabled by default PiperOrigin-RevId: 230413014
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java index c398b2f..a913169 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java +++ b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java
@@ -345,7 +345,7 @@ @Option( name = "incompatible_expand_directories", - defaultValue = "false", + defaultValue = "true", category = "incompatible changes", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -548,4 +548,3 @@ .build(); } } -
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java index 4cb4ef9..b9e5493 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java
@@ -219,7 +219,7 @@ .incompatibleDisallowLegacyJavaInfo(false) .incompatibleDisallowLoadLabelsToCrossPackageBoundaries(false) .incompatibleDisallowOldStyleArgsAdd(false) - .incompatibleExpandDirectories(false) + .incompatibleExpandDirectories(true) .incompatibleGenerateJavaCommonSourceJar(false) .incompatibleNewActionsApi(false) .incompatibleNoAttrLicense(false) @@ -311,4 +311,3 @@ public abstract SkylarkSemantics build(); } } -