diff options
| author |  gregce <gregce@google.com> | 2017-09-12 20:50:21 +0200 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2017-09-13 19:06:01 +0200 |
| commit | be805e05ef8fa52522544b7d09768e581d17e6ca (patch) | |
| tree | 660ef85a2309d2fffb9bc40a412090faea2fa935 /src/main/java/com/google/devtools/build/lib/buildtool | |
| parent | d9b634687e154cdff2c8fb4c553149aad1d2cf86 (diff) | |
Remove unused class after removal of BazelConfigurationCollection.
Also pipe keepGoing back into initial configuration creation.
PiperOrigin-RevId: 168412512
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/buildtool')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java | 8 |
1 files changed, 3 insertions, 5 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 eab48fd588..777c9e8dbc 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 @@ -139,7 +139,6 @@ public final class BuildTool { env.setupPackageCache(request, DefaultsPackage.getDefaultsPackageContent(buildOptions)); ExecutionTool executionTool = null; - BuildConfigurationCollection configurations; boolean catastrophe = false; try { env.getEventBus().post(new BuildStartingEvent(env, request)); @@ -189,10 +188,9 @@ public final class BuildTool { env.throwPendingException(); // Configuration creation. - // TODO(gregce): BuildConfigurationCollection is important for static configs, less so for - // dynamic configs. Consider dropping it outright and passing on-the-fly target / host configs - // directly when needed (although this could be hard when Skyframe is unavailable). - configurations = + // TODO(gregce): Consider dropping this phase and passing on-the-fly target / host configs as + // needed. This requires cleaning up the invalidation in SkyframeBuildView.setConfigurations. + BuildConfigurationCollection configurations = env.getSkyframeExecutor() .createConfigurations( env.getReporter(), |