Simplify the createConfiguration method in SkyframeExecutor.

Instead of passing BuildConfigurationKey instances around, just pass in the
little data we actually need. This allows removing the BuildConfigurationKey
class.

--
MOS_MIGRATED_REVID=91865340

1 files changed, 4 insertions, 15 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
index 2309b6e9a8..704cf32ad4 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -24,7 +24,6 @@ import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Range;
 import com.google.common.collect.Sets;
@@ -45,7 +44,6 @@ import com.google.devtools.build.lib.analysis.WorkspaceStatusAction;
 import com.google.devtools.build.lib.analysis.config.BinTools;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.config.BuildConfigurationCollection;
-import com.google.devtools.build.lib.analysis.config.BuildConfigurationKey;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.analysis.config.ConfigurationFactory;
 import com.google.devtools.build.lib.analysis.config.DefaultsPackage;
@@ -982,32 +980,23 @@ public final class BlazeRuntime {
   }
 
   /**
-   * Constructs a build configuration key for the given options.
-   */
-  public BuildConfigurationKey getBuildConfigurationKey(BuildOptions buildOptions,
-      ImmutableSortedSet<String> multiCpu) {
-    return new BuildConfigurationKey(buildOptions, directories, multiCpu);
-  }
-
-  /**
    * This method only exists for the benefit of InfoCommand, which needs to construct a {@link
    * BuildConfigurationCollection} without running a full loading phase. Don't add any more clients;
    * instead, we should change info so that it doesn't need the configuration.
    */
   public BuildConfigurationCollection getConfigurations(OptionsProvider optionsProvider)
       throws InvalidConfigurationException, InterruptedException {
-    BuildConfigurationKey configurationKey = getBuildConfigurationKey(
-        createBuildOptions(optionsProvider), ImmutableSortedSet.<String>of());
+    BuildOptions buildOptions = createBuildOptions(optionsProvider);
     boolean keepGoing = optionsProvider.getOptions(BuildView.Options.class).keepGoing;
     LoadedPackageProvider loadedPackageProvider =
         loadingPhaseRunner.loadForConfigurations(reporter,
-            ImmutableSet.copyOf(configurationKey.getLabelsToLoadUnconditionally().values()),
+            ImmutableSet.copyOf(buildOptions.getAllLabels().values()),
             keepGoing);
     if (loadedPackageProvider == null) {
       throw new InvalidConfigurationException("Configuration creation failed");
     }
-    return skyframeExecutor.createConfigurations(keepGoing, configurationFactory,
-        configurationKey);
+    return skyframeExecutor.createConfigurations(configurationFactory,
+        buildOptions, directories, ImmutableSet.<String>of(), keepGoing);
   }
 
   /**