diff options
Diffstat (limited to 'src/main/java/com/google/devtools')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunner.java | 4 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunner.java b/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunner.java index 9364d6a1dd..280123378b 100644 --- a/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunner.java +++ b/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunner.java @@ -271,7 +271,7 @@ public class LoadingPhaseRunner { * a {@code 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 LoadedPackageProvider loadForConfigurations(EventHandler eventHandler, + public boolean loadForConfigurations(EventHandler eventHandler, Set<Label> labelsToLoad, boolean keepGoing) throws InterruptedException { // Use a new Label Visitor here to avoid erasing the cache on the existing one. TransitivePackageLoader transitivePackageLoader = packageManager.newTransitiveLoader(); @@ -279,7 +279,7 @@ public class LoadingPhaseRunner { eventHandler, ImmutableSet.<Target>of(), labelsToLoad, keepGoing, /*parallelThreads=*/10, /*maxDepth=*/Integer.MAX_VALUE); - return loadingSuccessful ? packageManager : null; + return loadingSuccessful; } /** diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java index fb7ad47b70..64a617ec30 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java @@ -30,7 +30,6 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.events.Reporter; import com.google.devtools.build.lib.packages.NoSuchThingException; import com.google.devtools.build.lib.packages.Target; -import com.google.devtools.build.lib.pkgcache.LoadedPackageProvider; import com.google.devtools.build.lib.pkgcache.PackageCacheOptions; import com.google.devtools.build.lib.pkgcache.PackageManager; import com.google.devtools.build.lib.skyframe.SkyframeExecutor; @@ -170,11 +169,11 @@ public final class CommandEnvironment { throws InvalidConfigurationException, InterruptedException { BuildOptions buildOptions = runtime.createBuildOptions(optionsProvider); boolean keepGoing = optionsProvider.getOptions(BuildView.Options.class).keepGoing; - LoadedPackageProvider loadedPackageProvider = + boolean loadingSuccessful = runtime.getLoadingPhaseRunner().loadForConfigurations(reporter, ImmutableSet.copyOf(buildOptions.getAllLabels().values()), keepGoing); - if (loadedPackageProvider == null) { + if (!loadingSuccessful) { throw new InvalidConfigurationException("Configuration creation failed"); } return getSkyframeExecutor().createConfigurations(runtime.getConfigurationFactory(), |