From be805e05ef8fa52522544b7d09768e581d17e6ca Mon Sep 17 00:00:00 2001 From: gregce Date: Tue, 12 Sep 2017 20:50:21 +0200 Subject: Remove unused class after removal of BazelConfigurationCollection. Also pipe keepGoing back into initial configuration creation. PiperOrigin-RevId: 168412512 --- .../java/com/google/devtools/build/lib/buildtool/BuildTool.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/buildtool') 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(), -- cgit v1.2.3