diff options
| author |  ulfjack <ulfjack@google.com> | 2017-07-11 13:36:41 +0200 |
|---|---|---|
| committer |  László Csomor <laszlocsomor@google.com> | 2017-07-11 14:47:49 +0200 |
| commit | 75483b58d047c3a4e26e098823dc3b77644c3c11 (patch) | |
| tree | dbeed4d706a79210264f088aa6dab5b578757a01 | |
| parent | a708a02680da349c85077acb6d8db21805342416 (diff) | |
Pass an EventHandler to OutputService.startBuild
PiperOrigin-RevId: 161512574
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java | 5 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/exec/OutputService.java | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java index e57c5ece7a..8c01bd040d 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java @@ -342,8 +342,9 @@ public class ExecutionTool { OutputService outputService = env.getOutputService(); ModifiedFileSet modifiedOutputFiles = ModifiedFileSet.EVERYTHING_MODIFIED; if (outputService != null) { - modifiedOutputFiles = outputService.startBuild(buildId, - request.getBuildOptions().finalizeActions); + modifiedOutputFiles = + outputService.startBuild( + env.getReporter(), buildId, request.getBuildOptions().finalizeActions); } else { // TODO(bazel-team): this could be just another OutputService startLocalOutputBuild(); diff --git a/src/main/java/com/google/devtools/build/lib/exec/OutputService.java b/src/main/java/com/google/devtools/build/lib/exec/OutputService.java index aaeb414c8a..17ff3a7950 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/OutputService.java +++ b/src/main/java/com/google/devtools/build/lib/exec/OutputService.java @@ -19,6 +19,7 @@ import com.google.devtools.build.lib.actions.BuildFailedException; import com.google.devtools.build.lib.actions.EnvironmentalExecException; import com.google.devtools.build.lib.actions.ExecException; import com.google.devtools.build.lib.actions.cache.MetadataHandler; +import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.util.AbruptExitException; import com.google.devtools.build.lib.vfs.BatchStat; @@ -63,7 +64,7 @@ public interface OutputService { * @throws BuildFailedException if build preparation failed * @throws InterruptedException */ - ModifiedFileSet startBuild(UUID buildId, boolean finalizeActions) + ModifiedFileSet startBuild(EventHandler eventHandler, UUID buildId, boolean finalizeActions) throws BuildFailedException, AbruptExitException, InterruptedException; /** |