Cleanup todo from static config removal

PiperOrigin-RevId: 168583913

2 files changed, 7 insertions, 26 deletions

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 b797532931..de5f998a8f 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
@@ -1061,8 +1061,7 @@ public class BuildView {
         ImmutableSet.copyOf(
             getDirectPrerequisiteDependenciesForTesting(
                     eventHandler, ct, configurations, /*toolchainContext=*/ null)
-                .values()),
-        false);
+                .values()));
   }
 
   @VisibleForTesting
@@ -1177,7 +1176,7 @@ public class BuildView {
 
     ImmutableMultimap<Dependency, ConfiguredTarget> cts = skyframeExecutor.getConfiguredTargetMap(
         eventHandler,
-        target.getConfiguration(), ImmutableSet.copyOf(depNodeNames.values()), false);
+        target.getConfiguration(), ImmutableSet.copyOf(depNodeNames.values()));
 
     OrderedSetMultimap<Attribute, ConfiguredTarget> result = OrderedSetMultimap.create();
     for (Map.Entry<Attribute, Dependency> entry : depNodeNames.entries()) {
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index 220190d2b7..ba926d5fbc 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -1234,10 +1234,9 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
   public ImmutableList<ConfiguredTarget> getConfiguredTargets(
       ExtendedEventHandler eventHandler,
       BuildConfiguration originalConfig,
-      Iterable<Dependency> keys,
-      boolean useOriginalConfig) {
+      Iterable<Dependency> keys) {
     return getConfiguredTargetMap(
-        eventHandler, originalConfig, keys, useOriginalConfig).values().asList();
+        eventHandler, originalConfig, keys).values().asList();
   }
 
   /**
@@ -1253,28 +1252,12 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
   public ImmutableMultimap<Dependency, ConfiguredTarget> getConfiguredTargetMap(
       ExtendedEventHandler eventHandler,
       BuildConfiguration originalConfig,
-      Iterable<Dependency> keys,
-      boolean useOriginalConfig) {
+      Iterable<Dependency> keys) {
     checkActive();
 
     Multimap<Dependency, BuildConfiguration> configs;
     if (originalConfig != null) {
-
-      if (useOriginalConfig) {
-        // This flag is used because of some unfortunate complexity in the configuration machinery:
-        // Most callers of this method pass a <Label, Configuration> pair to directly create a
-        // ConfiguredTarget from, but happen to use the Dependency data structure to pass that
-        // info (even though the data has nothing to do with dependencies). If this configuration
-        // includes a split transition, a dynamic configuration created from it will *not*
-        // include that transition (because dynamic configurations don't embed transitions to
-        // other configurations. In that case, we need to preserve the original configuration.
-        // TODO(bazel-team); make this unnecessary once split transition logic is properly ported
-        // out of configurations.
-        configs = ArrayListMultimap.<Dependency, BuildConfiguration>create();
-        configs.put(Iterables.getOnlyElement(keys), originalConfig);
-      } else {
-        configs = getConfigurations(eventHandler, originalConfig.getOptions(), keys);
-      }
+     configs = getConfigurations(eventHandler, originalConfig.getOptions(), keys);
     } else {
       configs = ArrayListMultimap.<Dependency, BuildConfiguration>create();
       for (Dependency key : keys) {
@@ -1595,8 +1578,7 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
             configuration,
             ImmutableList.of(configuration == null
                 ? Dependency.withNullConfiguration(label)
-                : Dependency.withTransitionAndAspects(label, transition, AspectCollection.EMPTY)),
-            false),
+                : Dependency.withTransitionAndAspects(label, transition, AspectCollection.EMPTY))),
         null);
   }