Lots more cleanup of "dynamic configurations" comments and test code.
PiperOrigin-RevId: 168607439
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index de5f998..57ba8e0 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -888,7 +888,7 @@
nodes.add(new TargetAndConfiguration(target, target.isConfigurable() ? config : null));
}
}
- return ImmutableList.copyOf(getDynamicConfigurations(nodes, eventHandler));
+ return ImmutableList.copyOf(getConfigurations(nodes, eventHandler));
}
/**
@@ -908,7 +908,7 @@
*/
// TODO(bazel-team): error out early for targets that fail - untrimmed configurations should
// never make it through analysis (and especially not seed ConfiguredTargetValues)
- private LinkedHashSet<TargetAndConfiguration> getDynamicConfigurations(
+ private LinkedHashSet<TargetAndConfiguration> getConfigurations(
Iterable<TargetAndConfiguration> inputs, ExtendedEventHandler eventHandler)
throws InterruptedException {
Map<Label, Target> labelsToTargets = new LinkedHashMap<>();
@@ -931,7 +931,7 @@
}
}
- // Maps <target, originalConfig> pairs to <target, dynamicConfig> pairs for targets that
+ // Maps <target, originalConfig> pairs to <target, finalConfig> pairs for targets that
// could be successfully Skyframe-evaluated.
Map<TargetAndConfiguration, TargetAndConfiguration> successfullyEvaluatedTargets =
new LinkedHashMap<>();
@@ -1003,17 +1003,17 @@
/**
- * Gets a dynamic configuration for the given target.
+ * Gets a configuration for the given target.
*
* <p>If {@link BuildConfiguration.Options#trimConfigurations()} is true, the configuration only
* includes the fragments needed by the fragment and its transitive closure. Else unconditionally
* includes all fragments.
*/
@VisibleForTesting
- public BuildConfiguration getDynamicConfigurationForTesting(
+ public BuildConfiguration getConfigurationForTesting(
Target target, BuildConfiguration config, ExtendedEventHandler eventHandler)
throws InterruptedException {
- return Iterables.getOnlyElement(getDynamicConfigurations(
+ return Iterables.getOnlyElement(getConfigurations(
ImmutableList.<TargetAndConfiguration>of(new TargetAndConfiguration(target, config)),
eventHandler)).getConfiguration();
}
@@ -1217,10 +1217,11 @@
}
/**
- * Returns a configured target for the specified target and configuration. If dynamic
- * configurations are activated, and the target in question has a top-level rule class transition,
- * that transition is applied in the returned ConfiguredTarget. Returns {@code null} if something
- * goes wrong.
+ * Returns a configured target for the specified target and configuration. If the target in
+ * question has a top-level rule class transition, that transition is applied in the returned
+ * ConfiguredTarget.
+ *
+ * <p>Returns {@code null} if something goes wrong.
*/
@VisibleForTesting
public ConfiguredTarget getConfiguredTargetForTesting(
