diff options
author | gregce <gregce@google.com> | 2017-12-28 13:29:32 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2017-12-28 13:31:01 -0800 |
commit | 192583d5fbf49f43bc7646e5750647362dfaecfe (patch) | |
tree | bb610ca8d2299311b7f33ed773f3513267112c2a /src | |
parent | d50cbbeef115f28c0cea1ac17572e0f12c0cf312 (diff) |
Remove obsolete ConfigurationTransition.SPLIT.
PiperOrigin-RevId: 180291093
Diffstat (limited to 'src')
3 files changed, 1 insertions, 17 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ConfigurationTransitionProxy.java b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ConfigurationTransitionProxy.java index 1bf0f403ef..3df17bf1af 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ConfigurationTransitionProxy.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ConfigurationTransitionProxy.java @@ -18,8 +18,7 @@ package com.google.devtools.build.lib.analysis.config.transitions; * Declaration how the configuration should change when following a label or label list attribute. * * <p>Do not add to this. This is a legacy interface from when Blaze had limited support for - * transitions. Use {@link com.google.devtools.build.lib.analysis.config.PatchTransition} or - * {@link SplitTransition} instead. + * transitions. Use {@link PatchTransition} or {@link SplitTransition} instead. */ @Deprecated public enum ConfigurationTransitionProxy implements Transition { @@ -32,13 +31,4 @@ public enum ConfigurationTransitionProxy implements Transition { /** Transition from the target configuration to the data configuration. */ // TODO(bazel-team): Move this elsewhere. DATA, - - /** - * Transition to one or more configurations. To obtain the actual child configurations, - * invoke {@link com.google.devtools.build.lib.packages.Attribute#getSplitTransition}). - * com.google.devtools.build.lib.packages.AttributeMap)}. - * - * <p>See {@link SplitTransition}. - **/ - SPLIT } diff --git a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java index 0a368e1fc8..75f933ee50 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java +++ b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java @@ -483,7 +483,6 @@ public final class Attribute implements Comparable<Attribute> { "the configuration transition is already set"); this.splitTransitionProvider = Preconditions.checkNotNull(splitTransitionProvider); - this.configTransition = ConfigurationTransitionProxy.SPLIT; return this; } @@ -502,8 +501,6 @@ public final class Attribute implements Comparable<Attribute> { public Builder<TYPE> cfg(Transition configTransition) { Preconditions.checkState(this.configTransition == ConfigurationTransitionProxy.NONE, "the configuration transition is already set"); - Preconditions.checkArgument(configTransition != ConfigurationTransitionProxy.SPLIT, - "split transitions must be defined using the SplitTransition object"); if (configTransition instanceof SplitTransition) { return cfg((SplitTransition) configTransition); } else { diff --git a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java index 3216066228..bffbec667c 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java @@ -14,7 +14,6 @@ package com.google.devtools.build.lib.packages; import static com.google.common.truth.Truth.assertThat; -import static com.google.devtools.build.lib.analysis.config.transitions.ConfigurationTransitionProxy.SPLIT; import static com.google.devtools.build.lib.packages.Attribute.attr; import static com.google.devtools.build.lib.packages.BuildType.LABEL; import static com.google.devtools.build.lib.packages.BuildType.LABEL_LIST; @@ -273,7 +272,6 @@ public class AttributeTest { public void testSplitTransition() throws Exception { TestSplitTransition splitTransition = new TestSplitTransition(); Attribute attr = attr("foo", LABEL).cfg(splitTransition).allowedFileTypes().build(); - assertThat(attr.getConfigurationTransition()).isEqualTo(SPLIT); assertThat(attr.hasSplitConfigurationTransition()).isTrue(); assertThat(attr.getSplitTransition(null)).isEqualTo(splitTransition); } @@ -283,7 +281,6 @@ public class AttributeTest { TestSplitTransitionProvider splitTransitionProvider = new TestSplitTransitionProvider(); Attribute attr = attr("foo", LABEL).cfg(splitTransitionProvider).allowedFileTypes().build(); - assertThat(attr.getConfigurationTransition()).isEqualTo(SPLIT); assertThat(attr.hasSplitConfigurationTransition()).isTrue(); assertThat(attr.getSplitTransition(null) instanceof TestSplitTransition).isTrue(); } |