diff options
5 files changed, 4 insertions, 29 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java index ff021167ba..c65b4aa8e4 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java +++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java @@ -579,12 +579,10 @@ public final class PackageFactory { } GlobList<String> globList = GlobList.captureResults(includes, excludes, matches); - if (env.getSemantics().incompatibleDisableGlobTracking()) { - // Converting to ImmutableList will remove glob information from the list. - return MutableList.copyOf(env, ImmutableList.copyOf(globList)); - } else { - return MutableList.copyOf(env, globList); - } + + // TODO(laurentlb): Get rid of globList type. + // Converting to ImmutableList will remove glob information from the list. + return MutableList.copyOf(env, ImmutableList.copyOf(globList)); } /** diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java index af06231ffe..28b3c6747a 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java +++ b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java @@ -46,7 +46,6 @@ public final class SkylarkSemanticsCodec implements ObjectCodec<SkylarkSemantics codedOut.writeBoolNoTag(semantics.incompatibleBzlDisallowLoadAfterStatement()); codedOut.writeBoolNoTag(semantics.incompatibleDepsetIsNotIterable()); codedOut.writeBoolNoTag(semantics.incompatibleDepsetUnion()); - codedOut.writeBoolNoTag(semantics.incompatibleDisableGlobTracking()); codedOut.writeBoolNoTag(semantics.incompatibleDisableObjcProviderResources()); codedOut.writeBoolNoTag(semantics.incompatibleDisallowDictPlus()); codedOut.writeBoolNoTag(semantics.incompatibleDisallowFileType()); @@ -70,7 +69,6 @@ public final class SkylarkSemanticsCodec implements ObjectCodec<SkylarkSemantics builder.incompatibleBzlDisallowLoadAfterStatement(codedIn.readBool()); builder.incompatibleDepsetIsNotIterable(codedIn.readBool()); builder.incompatibleDepsetUnion(codedIn.readBool()); - builder.incompatibleDisableGlobTracking(codedIn.readBool()); builder.incompatibleDisableObjcProviderResources(codedIn.readBool()); builder.incompatibleDisallowDictPlus(codedIn.readBool()); builder.incompatibleDisallowFileType(codedIn.readBool()); 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 e62f837088..82c89a025a 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 @@ -106,19 +106,6 @@ public class SkylarkSemanticsOptions extends OptionsBase implements Serializable public boolean incompatibleDepsetIsNotIterable; @Option( - name = "incompatible_disable_glob_tracking", - defaultValue = "true", - documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, - effectTags = {OptionEffectTag.UNKNOWN}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, - help = "If set to true, do not track the values of globs (this is used by rare specific cases" - ) - public boolean incompatibleDisableGlobTracking; - - @Option( name = "incompatible_disable_objc_provider_resources", defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, @@ -288,7 +275,6 @@ public class SkylarkSemanticsOptions extends OptionsBase implements Serializable .incompatibleBzlDisallowLoadAfterStatement(incompatibleBzlDisallowLoadAfterStatement) .incompatibleDepsetIsNotIterable(incompatibleDepsetIsNotIterable) .incompatibleDepsetUnion(incompatibleDepsetUnion) - .incompatibleDisableGlobTracking(incompatibleDisableGlobTracking) .incompatibleDisableObjcProviderResources(incompatibleDisableObjcProviderResources) .incompatibleDisallowDictPlus(incompatibleDisallowDictPlus) .incompatibleDisallowFileType(incompatibleDisallowFileType) 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 b4b23880c2..d19b2db21c 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 @@ -45,8 +45,6 @@ public abstract class SkylarkSemantics { public abstract boolean incompatibleDepsetUnion(); - public abstract boolean incompatibleDisableGlobTracking(); - public abstract boolean incompatibleDisableObjcProviderResources(); public abstract boolean incompatibleDisallowDictPlus(); @@ -89,7 +87,6 @@ public abstract class SkylarkSemantics { .incompatibleBzlDisallowLoadAfterStatement(false) .incompatibleDepsetIsNotIterable(false) .incompatibleDepsetUnion(false) - .incompatibleDisableGlobTracking(true) .incompatibleDisableObjcProviderResources(false) .incompatibleDisallowDictPlus(false) .incompatibleDisallowFileType(false) @@ -115,8 +112,6 @@ public abstract class SkylarkSemantics { public abstract Builder incompatibleDepsetUnion(boolean value); - public abstract Builder incompatibleDisableGlobTracking(boolean value); - public abstract Builder incompatibleDisableObjcProviderResources(boolean value); public abstract Builder incompatibleDisallowDictPlus(boolean value); diff --git a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java index 7c7004a5c8..6ef0459657 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java @@ -122,7 +122,6 @@ public class SkylarkSemanticsConsistencyTest { "--incompatible_bzl_disallow_load_after_statement=" + rand.nextBoolean(), "--incompatible_depset_is_not_iterable=" + rand.nextBoolean(), "--incompatible_depset_union=" + rand.nextBoolean(), - "--incompatible_disable_glob_tracking=" + rand.nextBoolean(), "--incompatible_disable_objc_provider_resources=" + rand.nextBoolean(), "--incompatible_disallow_dict_plus=" + rand.nextBoolean(), "--incompatible_disallow_filetype=" + rand.nextBoolean(), @@ -147,7 +146,6 @@ public class SkylarkSemanticsConsistencyTest { .incompatibleBzlDisallowLoadAfterStatement(rand.nextBoolean()) .incompatibleDepsetIsNotIterable(rand.nextBoolean()) .incompatibleDepsetUnion(rand.nextBoolean()) - .incompatibleDisableGlobTracking(rand.nextBoolean()) .incompatibleDisableObjcProviderResources(rand.nextBoolean()) .incompatibleDisallowDictPlus(rand.nextBoolean()) .incompatibleDisallowFileType(rand.nextBoolean()) |