From ca2d8d2748c1b419bde4926a69100f81399c182d Mon Sep 17 00:00:00 2001 From: Ulf Adams Date: Wed, 16 Sep 2015 13:00:45 +0000 Subject: Move several parts of BlazeRuntime to CommandEnvironment. The main piece is the blaze module environment, which is only valid during command execution. Also configuration creation and precompleteCommand. -- MOS_MIGRATED_REVID=103186467 --- .../java/com/google/devtools/build/lib/buildtool/BuildTool.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 d646b5148a..0f7251202d 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 @@ -181,7 +181,7 @@ public final class BuildTool { request.getMultiCpus(), request.getViewOptions().keepGoing); env.getEventBus().post(new ConfigurationsCreatedEvent(configurations)); - runtime.throwPendingException(); + env.throwPendingException(); if (configurations.getTargetConfigurations().size() == 1) { // TODO(bazel-team): This is not optimal - we retain backwards compatibility in the case // where there's only a single configuration, but we don't send an event in the multi-config @@ -376,7 +376,7 @@ public final class BuildTool { throws LoadingFailedException, TargetParsingException, InterruptedException, AbruptExitException { Profiler.instance().markPhase(ProfilePhase.LOAD); - runtime.throwPendingException(); + env.throwPendingException(); initializeOutputFilter(request); @@ -400,7 +400,7 @@ public final class BuildTool { env.getEventBus(), request.getTargets(), request.getLoadingOptions(), runtime.createBuildOptions(request).getAllLabels(), keepGoing, isLoadingEnabled(request), request.shouldRunTests(), callback); - runtime.throwPendingException(); + env.throwPendingException(); return result; } -- cgit v1.2.3