aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationCollectionFunction.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationCollectionFunction.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationCollectionFunction.java9
1 files changed, 2 insertions, 7 deletions
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 085238d1cf..5e16f0c00b 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
@@ -33,7 +33,6 @@ import com.google.devtools.build.skyframe.SkyValue;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import javax.annotation.Nullable;
@@ -44,15 +43,12 @@ import javax.annotation.Nullable;
public class ConfigurationCollectionFunction implements SkyFunction {
private final Supplier<ConfigurationFactory> configurationFactory;
- private final Supplier<Map<String, String>> testEnv;
private final Supplier<Set<Package>> configurationPackages;
public ConfigurationCollectionFunction(
Supplier<ConfigurationFactory> configurationFactory,
- Supplier<Map<String, String>> testEnv,
Supplier<Set<Package>> configurationPackages) {
this.configurationFactory = configurationFactory;
- this.testEnv = testEnv;
this.configurationPackages = configurationPackages;
}
@@ -61,7 +57,6 @@ public class ConfigurationCollectionFunction implements SkyFunction {
ConfigurationCollectionFunctionException {
ConfigurationCollectionKey collectionKey = (ConfigurationCollectionKey) skyKey.argument();
try {
- PrecomputedValue.TEST_ENVIRONMENT_VARIABLES.get(env);
BlazeDirectories directories = PrecomputedValue.BLAZE_DIRECTORIES.get(env);
if (env.valuesMissing()) {
return null;
@@ -70,8 +65,8 @@ public class ConfigurationCollectionFunction implements SkyFunction {
BuildConfigurationCollection result =
getConfigurations(env.getListener(),
new SkyframePackageLoaderWithValueEnvironment(env, configurationPackages.get()),
- new BuildConfigurationKey(collectionKey.getBuildOptions(), directories, testEnv.get(),
- collectionKey.getMultiCpu()));
+ new BuildConfigurationKey(
+ collectionKey.getBuildOptions(), directories, collectionKey.getMultiCpu()));
// BuildConfigurationCollection can be created, but dependencies to some files might be
// missing. In that case we need to build configurationCollection again.