Remove unused code.

--
MOS_MIGRATED_REVID=102339394

6 files changed, 15 insertions, 72 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
index 716ab8a58c..c50d6592d7 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
@@ -20,7 +20,6 @@ import com.google.common.base.Stopwatch;
 import com.google.common.base.Throwables;
 import com.google.common.base.Verify;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
 import com.google.common.eventbus.EventBus;
 import com.google.devtools.build.lib.actions.BuildFailedException;
 import com.google.devtools.build.lib.actions.ExecutorInitException;
@@ -204,8 +203,7 @@ public class BuildTool {
         runtime.getSkyframeExecutor().injectTopLevelContext(request.getTopLevelArtifactContext());
         executionTool.executeBuild(request.getId(), analysisResult, result,
             runtime.getSkyframeExecutor(), configurations,
-            mergePackageRoots(loadingResult.getPackageRoots(),
-            runtime.getSkyframeExecutor().getPackageRoots()));
+            transformPackageRoots(loadingResult.getPackageRoots()));
       }
 
       String delayedErrorMsg = analysisResult.getError();
@@ -291,22 +289,13 @@ public class BuildTool {
     }
   }
 
-  private ImmutableMap<PathFragment, Path> mergePackageRoots(
-      ImmutableMap<PackageIdentifier, Path> first,
-      ImmutableMap<PackageIdentifier, Path> second) {
-    Map<PathFragment, Path> builder = Maps.newHashMap();
-    for (Map.Entry<PackageIdentifier, Path> entry : first.entrySet()) {
+  private ImmutableMap<PathFragment, Path> transformPackageRoots(
+      ImmutableMap<PackageIdentifier, Path> packageRoots) {
+    ImmutableMap.Builder<PathFragment, Path> builder = ImmutableMap.builder();
+    for (Map.Entry<PackageIdentifier, Path> entry : packageRoots.entrySet()) {
       builder.put(entry.getKey().getPathFragment(), entry.getValue());
     }
-    for (Map.Entry<PackageIdentifier, Path> entry : second.entrySet()) {
-      if (first.containsKey(entry.getKey())) {
-        Preconditions.checkState(first.get(entry.getKey()).equals(entry.getValue()));
-      } else {
-        // This could overwrite entries from first in other repositories.
-        builder.put(entry.getKey().getPackageFragment(), entry.getValue());
-      }
-    }
-    return ImmutableMap.copyOf(builder);
+    return builder.build();
   }
 
   private void reportExceptionError(Exception e) {
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationCollectionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationCollectionFunction.java
index 7883db2fe1..5a94192856 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationCollectionFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationCollectionFunction.java
@@ -27,7 +27,6 @@ import com.google.devtools.build.lib.analysis.config.PackageProviderForConfigura
 import com.google.devtools.build.lib.events.EventHandler;
 import com.google.devtools.build.lib.events.StoredEventHandler;
 import com.google.devtools.build.lib.packages.Attribute;
-import com.google.devtools.build.lib.packages.Package;
 import com.google.devtools.build.lib.skyframe.ConfigurationCollectionValue.ConfigurationCollectionKey;
 import com.google.devtools.build.skyframe.SkyFunction;
 import com.google.devtools.build.skyframe.SkyFunctionException;
@@ -36,7 +35,6 @@ import com.google.devtools.build.skyframe.SkyValue;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 import javax.annotation.Nullable;
 
@@ -46,13 +44,9 @@ import javax.annotation.Nullable;
 public class ConfigurationCollectionFunction implements SkyFunction {
 
   private final Supplier<ConfigurationFactory> configurationFactory;
-  private final Supplier<Set<Package>> configurationPackages;
 
-  public ConfigurationCollectionFunction(
-      Supplier<ConfigurationFactory> configurationFactory,
-      Supplier<Set<Package>> configurationPackages) {
+  public ConfigurationCollectionFunction(Supplier<ConfigurationFactory> configurationFactory) {
     this.configurationFactory = configurationFactory;
-    this.configurationPackages = configurationPackages;
   }
 
   @Override
@@ -61,8 +55,7 @@ public class ConfigurationCollectionFunction implements SkyFunction {
     ConfigurationCollectionKey collectionKey = (ConfigurationCollectionKey) skyKey.argument();
     try {
       BuildConfigurationCollection result =
-          getConfigurations(env,
-              new SkyframePackageLoaderWithValueEnvironment(env, configurationPackages.get()),
+          getConfigurations(env, new SkyframePackageLoaderWithValueEnvironment(env),
               collectionKey.getBuildOptions(), collectionKey.getMultiCpu());
 
       // BuildConfigurationCollection can be created, but dependencies to some files might be
@@ -77,7 +70,7 @@ public class ConfigurationCollectionFunction implements SkyFunction {
       if (env.valuesMissing()) {
         return null;
       }
-      return new ConfigurationCollectionValue(result, configurationPackages.get());
+      return new ConfigurationCollectionValue(result);
     } catch (InvalidConfigurationException e) {
       throw new ConfigurationCollectionFunctionException(e);
     }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationCollectionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationCollectionValue.java
index 30e4fd7317..3c3ca8b067 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationCollectionValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationCollectionValue.java
@@ -19,13 +19,11 @@ import com.google.devtools.build.lib.analysis.config.BuildConfigurationCollectio
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe;
-import com.google.devtools.build.lib.packages.Package;
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
 
 import java.io.Serializable;
 import java.util.Objects;
-import java.util.Set;
 
 /**
  * A Skyframe value representing a build configuration collection.
@@ -35,25 +33,15 @@ import java.util.Set;
 public class ConfigurationCollectionValue implements SkyValue {
 
   private final BuildConfigurationCollection configurationCollection;
-  private final ImmutableSet<Package> configurationPackages;
 
-  ConfigurationCollectionValue(BuildConfigurationCollection configurationCollection,
-      Set<Package> configurationPackages) {
+  ConfigurationCollectionValue(BuildConfigurationCollection configurationCollection) {
     this.configurationCollection = Preconditions.checkNotNull(configurationCollection);
-    this.configurationPackages = ImmutableSet.copyOf(configurationPackages);
   }
 
   public BuildConfigurationCollection getConfigurationCollection() {
     return configurationCollection;
   }
 
-  /**
-   * Returns set of packages required for configuration.
-   */
-  public Set<Package> getConfigurationPackages() {
-    return configurationPackages;
-  }
-
   @ThreadSafe
   public static SkyKey key(BuildOptions buildOptions, ImmutableSet<String> multiCpu) {
     return new SkyKey(SkyFunctions.CONFIGURATION_COLLECTION, 
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationFragmentFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationFragmentFunction.java
index 0393b16aa6..d19da4bd11 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationFragmentFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationFragmentFunction.java
@@ -36,7 +36,6 @@ import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
 
 import java.io.IOException;
-import java.util.Set;
 
 /**
  * A builder for {@link ConfigurationFragmentValue}s.
@@ -44,13 +43,10 @@ import java.util.Set;
 public class ConfigurationFragmentFunction implements SkyFunction {
 
   private final Supplier<ImmutableList<ConfigurationFragmentFactory>> configurationFragments;
-  private final Supplier<Set<Package>> configurationPackages;
 
   public ConfigurationFragmentFunction(
-      Supplier<ImmutableList<ConfigurationFragmentFactory>> configurationFragments,
-      Supplier<Set<Package>> configurationPackages) {
+      Supplier<ImmutableList<ConfigurationFragmentFactory>> configurationFragments) {
     this.configurationFragments = configurationFragments;
-    this.configurationPackages = configurationPackages;
   }
 
   @Override
@@ -62,7 +58,7 @@ public class ConfigurationFragmentFunction implements SkyFunction {
     ConfigurationFragmentFactory factory = getFactory(configurationFragmentKey.getFragmentType());
     try {
       PackageProviderForConfigurations loadedPackageProvider = 
-          new SkyframePackageLoaderWithValueEnvironment(env, configurationPackages.get());
+          new SkyframePackageLoaderWithValueEnvironment(env);
       ConfigurationEnvironment confEnv = new ConfigurationBuilderEnvironment(loadedPackageProvider);
       Fragment fragment = factory.create(confEnv, buildOptions);
       
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 cc54e4c2af..8f44d5d1d7 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
@@ -245,7 +245,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
   private MutableSupplier<ConfigurationFactory> configurationFactory = new MutableSupplier<>();
   private MutableSupplier<ImmutableList<ConfigurationFragmentFactory>> configurationFragments =
       new MutableSupplier<>();
-  private MutableSupplier<Set<Package>> configurationPackages = new MutableSupplier<>();
 
   private static final Logger LOG = Logger.getLogger(SkyframeExecutor.class.getName());
 
@@ -336,9 +335,9 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
     map.put(SkyFunctions.BUILD_CONFIGURATION,
         new BuildConfigurationFunction(directories, ruleClassProvider));
     map.put(SkyFunctions.CONFIGURATION_COLLECTION, new ConfigurationCollectionFunction(
-        configurationFactory, configurationPackages));
+        configurationFactory));
     map.put(SkyFunctions.CONFIGURATION_FRAGMENT, new ConfigurationFragmentFunction(
-        configurationFragments, configurationPackages));
+        configurationFragments));
     map.put(
         SkyFunctions.WORKSPACE_FILE,
         new WorkspaceFileFunction(ruleClassProvider, pkgFactory, directories));
@@ -700,19 +699,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
     return skyframeActionExecutor;
   }
 
-  /**
-   * The map from package names to the package root where each package was found; this is used to
-   * set up the symlink tree.
-   */
-  public ImmutableMap<PackageIdentifier, Path> getPackageRoots() {
-    // Make a map of the package names to their root paths.
-    ImmutableMap.Builder<PackageIdentifier, Path> packageRoots = ImmutableMap.builder();
-    for (Package pkg : configurationPackages.get()) {
-      packageRoots.put(pkg.getPackageIdentifier(), pkg.getSourceRoot());
-    }
-    return packageRoots.build();
-  }
-
   @VisibleForTesting
   ImmutableList<Path> getPathEntries() {
     return pkgLocator.get().getPathEntries();
@@ -928,7 +914,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
     PrecomputedValue.BLAZE_DIRECTORIES.set(injectable(), directories);
     this.configurationFactory.set(configurationFactory);
     this.configurationFragments.set(ImmutableList.copyOf(configurationFactory.getFactories()));
-    this.configurationPackages.set(Sets.<Package>newConcurrentHashSet());
   }
 
   /**
@@ -939,7 +924,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
       ConfigurationFactory configurationFactory, BuildOptions buildOptions,
       BlazeDirectories directories, Set<String> multiCpu, boolean keepGoing)
       throws InvalidConfigurationException, InterruptedException {
-    this.configurationPackages.set(Sets.<Package>newConcurrentHashSet());
     this.configurationFactory.set(configurationFactory);
     this.configurationFragments.set(ImmutableList.copyOf(configurationFactory.getFactories()));
     // TODO(bazel-team): find a way to use only BuildConfigurationKey instead of
@@ -964,8 +948,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
         "Result of evaluate() must contain exactly one value %s", result);
     ConfigurationCollectionValue configurationValue =
         Iterables.getOnlyElement(result.values());
-    this.configurationPackages.set(
-        Sets.newConcurrentHashSet(configurationValue.getConfigurationPackages()));
     return configurationValue.getConfigurationCollection();
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframePackageLoaderWithValueEnvironment.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframePackageLoaderWithValueEnvironment.java
index 0d707aea6c..64ee756562 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframePackageLoaderWithValueEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframePackageLoaderWithValueEnvironment.java
@@ -32,7 +32,6 @@ import com.google.devtools.build.skyframe.SkyFunction;
 import com.google.devtools.build.skyframe.SkyKey;
 
 import java.io.IOException;
-import java.util.Set;
 
 /**
  * Repeats functionality of {@link SkyframePackageLoader} but uses
@@ -42,19 +41,15 @@ import java.util.Set;
 class SkyframePackageLoaderWithValueEnvironment implements
     PackageProviderForConfigurations {
   private final SkyFunction.Environment env;
-  private final Set<Package> packages;
 
-  public SkyframePackageLoaderWithValueEnvironment(SkyFunction.Environment env,
-      Set<Package> packages) {
+  public SkyframePackageLoaderWithValueEnvironment(SkyFunction.Environment env) {
     this.env = env;
-    this.packages = packages;
   }
 
   private Package getPackage(PackageIdentifier pkgIdentifier) throws NoSuchPackageException{
     SkyKey key = PackageValue.key(pkgIdentifier);
     PackageValue value = (PackageValue) env.getValueOrThrow(key, NoSuchPackageException.class);
     if (value != null) {
-      packages.add(value.getPackage());
       return value.getPackage();
     }
     return null;