From cac6839ea63ddc3e370f785804a4349ce60f80fc Mon Sep 17 00:00:00 2001 From: gregce Date: Mon, 10 Jul 2017 22:32:54 +0200 Subject: Remove dynamic configs dep on the static transition table. PiperOrigin-RevId: 161432622 --- .../lib/analysis/config/BuildConfigurationCollection.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java') diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java index 1137280bde..439cc3619c 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java @@ -25,7 +25,6 @@ import com.google.devtools.build.lib.packages.Attribute.Transition; import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.util.Preconditions; - import java.io.PrintStream; import java.io.Serializable; import java.util.Collection; @@ -98,8 +97,11 @@ public final class BuildConfigurationCollection { } /** - * Returns all configurations that can be reached from the target configuration through any kind - * of configuration transition. + * For static configurations, returns all configurations that can be reached from the target + * configurations through any kind of configuration transition. + * + *

For dynamic configurations, returns the target configurations (since configurations aren't + * reached through other configurations). */ public Collection getAllConfigurations() { Set result = new LinkedHashSet<>(); @@ -172,6 +174,10 @@ public final class BuildConfigurationCollection { public Transitions(BuildConfiguration configuration, Map transitionTable, ListMultimap, BuildConfiguration> splitTransitionTable) { + Preconditions.checkState(!configuration.useDynamicConfigurations(), + "Dynamic configurations don't use this class and static configurations are going away. " + + "Anything added here is dead code. Contact Blaze developers if you need help."); + this.configuration = configuration; this.transitionTable = ImmutableMap.copyOf(transitionTable); // Do not remove , BuildConfiguration>: -- cgit v1.2.3