diff options
author | 2017-08-16 21:33:48 +0200 | |
---|---|---|
committer | 2017-08-17 09:54:15 +0200 | |
commit | d63ee814e2493bc74b74842744a8471a0aeeb0ef (patch) | |
tree | a0bf485ccd08148eebaf180c5f23491f1bc394c1 /src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationCollectionFunction.java | |
parent | c65147b4bb866bd8ec553dcbec5e9bb59c164493 (diff) |
Remove ConfigurationFactory as part of the static configuration cleanup.
PiperOrigin-RevId: 165478994
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.java | 12 |
1 files changed, 3 insertions, 9 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 ccabf7d1e0..e5d8d111a1 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 @@ -13,7 +13,6 @@ // limitations under the License. package com.google.devtools.build.lib.skyframe; -import com.google.common.base.Supplier; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.collect.ImmutableSet; @@ -21,7 +20,6 @@ import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; 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.BuildOptions; -import com.google.devtools.build.lib.analysis.config.ConfigurationFactory; import com.google.devtools.build.lib.analysis.config.HostTransition; import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; import com.google.devtools.build.lib.analysis.config.PackageProviderForConfigurations; @@ -45,13 +43,9 @@ import javax.annotation.Nullable; */ @Deprecated public class ConfigurationCollectionFunction implements SkyFunction { - - private final Supplier<ConfigurationFactory> configurationFactory; private final RuleClassProvider ruleClassProvider; - public ConfigurationCollectionFunction(Supplier<ConfigurationFactory> configurationFactory, - RuleClassProvider ruleClassProvider) { - this.configurationFactory = configurationFactory; + public ConfigurationCollectionFunction(RuleClassProvider ruleClassProvider) { this.ruleClassProvider = ruleClassProvider; } @@ -169,8 +163,8 @@ public class ConfigurationCollectionFunction implements SkyFunction { cpuOverride; } - BuildConfiguration targetConfig = configurationFactory.get().createConfigurations( - cache, loadedPackageProvider, buildOptions, eventHandler, repositoryName); + // Dead code: being removed. The original value used a class that's already been deleted. + BuildConfiguration targetConfig = null; if (targetConfig == null) { return null; } |