diff options
| author |  gregce <gregce@google.com> | 2018-06-27 17:44:45 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-27 17:45:53 -0700 |
| commit | bceecab895e9e196919cd8d7db5e810ae3334dcc (patch) | |
| tree | 26e06f13663c005f6e67da14b8261cf5071a8be0 /src/main/java/com/google/devtools/build/lib/packages | |
| parent | 7bcb8eda43aad9318415c2be0596edfaac52bb9d (diff) | |
Add --incompatible_disable_data_transition for 'cfg = "data"' Skylark calls
PiperOrigin-RevId: 202400312
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/packages')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java | 14 |
2 files changed, 16 insertions, 0 deletions
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 c1d6dac164..0a7d7f7ccd 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 @@ -48,6 +48,7 @@ public final class SkylarkSemanticsCodec implements ObjectCodec<SkylarkSemantics codedOut.writeBoolNoTag(semantics.incompatibleDepsetIsNotIterable()); codedOut.writeBoolNoTag(semantics.incompatibleDepsetUnion()); codedOut.writeBoolNoTag(semantics.incompatibleDisableObjcProviderResources()); + codedOut.writeBoolNoTag(semantics.incompatibleDisallowDataTransition()); codedOut.writeBoolNoTag(semantics.incompatibleDisallowDictPlus()); codedOut.writeBoolNoTag(semantics.incompatibleDisallowFileType()); codedOut.writeBoolNoTag(semantics.incompatibleDisallowLegacyJavaInfo()); @@ -73,6 +74,7 @@ public final class SkylarkSemanticsCodec implements ObjectCodec<SkylarkSemantics builder.incompatibleDepsetIsNotIterable(codedIn.readBool()); builder.incompatibleDepsetUnion(codedIn.readBool()); builder.incompatibleDisableObjcProviderResources(codedIn.readBool()); + builder.incompatibleDisallowDataTransition(codedIn.readBool()); builder.incompatibleDisallowDictPlus(codedIn.readBool()); builder.incompatibleDisallowFileType(codedIn.readBool()); builder.incompatibleDisallowLegacyJavaInfo(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 d77f5c92ca..14c68c4d90 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 @@ -128,6 +128,19 @@ public class SkylarkSemanticsOptions extends OptionsBase implements Serializable public boolean incompatibleDisableObjcProviderResources; @Option( + name = "incompatible_disallow_data_transition", + defaultValue = "false", + documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, + effectTags = {OptionEffectTag.UNKNOWN}, + metadataTags = { + OptionMetadataTag.INCOMPATIBLE_CHANGE, + OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES + }, + help = "If set to true, rule attributes cannot set 'cfg = \"data\"', which is a noop." + ) + public boolean incompatibleDisallowDataTransition; + + @Option( name = "incompatible_disallow_dict_plus", defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, @@ -302,6 +315,7 @@ public class SkylarkSemanticsOptions extends OptionsBase implements Serializable .incompatibleDepsetIsNotIterable(incompatibleDepsetIsNotIterable) .incompatibleDepsetUnion(incompatibleDepsetUnion) .incompatibleDisableObjcProviderResources(incompatibleDisableObjcProviderResources) + .incompatibleDisallowDataTransition(incompatibleDisallowDataTransition) .incompatibleDisallowDictPlus(incompatibleDisallowDictPlus) .incompatibleDisallowFileType(incompatibleDisallowFileType) .incompatibleDisallowLegacyJavaInfo(incompatibleDisallowLegacyJavaInfo) |