diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationFactory.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationFactory.java | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationFactory.java index 31eb150cab..595f5271d2 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationFactory.java @@ -22,11 +22,9 @@ import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Fragment import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadCompatible; import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.util.Preconditions; - import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.annotation.Nullable; /** @@ -69,23 +67,27 @@ public final class ConfigurationFactory { @Nullable public BuildConfiguration createConfigurations( Cache<String, BuildConfiguration> cache, - PackageProviderForConfigurations loadedPackageProvider, BuildOptions buildOptions, + PackageProviderForConfigurations loadedPackageProvider, + BuildOptions buildOptions, EventHandler errorEventListener) - throws InvalidConfigurationException { + throws InvalidConfigurationException, InterruptedException { return configurationCollectionFactory.createConfigurations(this, cache, loadedPackageProvider, buildOptions, errorEventListener); } /** - * Returns a {@link com.google.devtools.build.lib.analysis.config.BuildConfiguration} based on - * the given set of build options. + * Returns a {@link com.google.devtools.build.lib.analysis.config.BuildConfiguration} based on the + * given set of build options. * * <p>If the configuration has already been created, re-uses it, otherwise, creates a new one. */ @Nullable - public BuildConfiguration getConfiguration(PackageProviderForConfigurations loadedPackageProvider, - BuildOptions buildOptions, boolean actionsDisabled, Cache<String, BuildConfiguration> cache) - throws InvalidConfigurationException { + public BuildConfiguration getConfiguration( + PackageProviderForConfigurations loadedPackageProvider, + BuildOptions buildOptions, + boolean actionsDisabled, + Cache<String, BuildConfiguration> cache) + throws InvalidConfigurationException, InterruptedException { String cacheKey = buildOptions.computeCacheKey(); BuildConfiguration result = cache.getIfPresent(cacheKey); |