diff options
Diffstat (limited to 'src/main/java/com/google/devtools')
16 files changed, 41 insertions, 67 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java b/src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java index dc79737863..c782656b26 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java @@ -17,9 +17,9 @@ import static java.nio.charset.StandardCharsets.ISO_8859_1; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; +import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.ActionOwner; import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.analysis.actions.AbstractFileWriteAction; import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.util.Fingerprint; @@ -113,10 +113,10 @@ public class SourceManifestAction extends AbstractFileWriteAction { } @Override - public DeterministicWriter newDeterministicWriter(EventHandler eventHandler, Executor executor) + public DeterministicWriter newDeterministicWriter(ActionExecutionContext ctx) throws IOException { final Map<PathFragment, Artifact> runfilesInputs = - runfiles.getRunfilesInputs(eventHandler, getOwner().getLocation()); + runfiles.getRunfilesInputs(ctx.getExecutor().getEventHandler(), getOwner().getLocation()); return new DeterministicWriter() { @Override public void writeOutputFile(OutputStream out) throws IOException { diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/AbstractFileWriteAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/AbstractFileWriteAction.java index 2c5daad8b0..79d9236c92 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/AbstractFileWriteAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/AbstractFileWriteAction.java @@ -25,7 +25,6 @@ import com.google.devtools.build.lib.actions.ExecException; import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.actions.ResourceSet; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.events.EventHandler; import java.io.IOException; import java.io.OutputStream; @@ -61,8 +60,7 @@ public abstract class AbstractFileWriteAction extends AbstractAction { public final void execute(ActionExecutionContext actionExecutionContext) throws ActionExecutionException, InterruptedException { try { - getStrategy(actionExecutionContext.getExecutor()).exec(actionExecutionContext.getExecutor(), - this, actionExecutionContext.getFileOutErr(), actionExecutionContext); + getStrategy(actionExecutionContext.getExecutor()).exec(this, actionExecutionContext); } catch (ExecException e) { throw e.toActionExecutionException( "Writing file for rule '" + Label.print(getOwner().getLabel()) + "'", @@ -74,14 +72,10 @@ public abstract class AbstractFileWriteAction extends AbstractAction { /** * Produce a DeterministicWriter that can write the file to an OutputStream deterministically. * - * @param eventHandler destination for warning messages. (Note that errors should - * still be indicated by throwing an exception; reporter.error() will - * not cause action execution to fail.) - * @param executor the Executor. - * @throws IOException if the content cannot be written to the output stream + * @param ctx context for use with creating the writer. */ - public abstract DeterministicWriter newDeterministicWriter(EventHandler eventHandler, - Executor executor) throws IOException, InterruptedException, ExecException; + public abstract DeterministicWriter newDeterministicWriter(ActionExecutionContext ctx) + throws IOException, InterruptedException, ExecException; /** * This hook is called after the File has been successfully written to disk. diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/BinaryFileWriteAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/BinaryFileWriteAction.java index c5c4822ebf..3e235bb0e1 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/BinaryFileWriteAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/BinaryFileWriteAction.java @@ -17,10 +17,9 @@ package com.google.devtools.build.lib.analysis.actions; import com.google.common.annotations.VisibleForTesting; import com.google.common.io.ByteSource; import com.google.common.io.ByteStreams; +import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.ActionOwner; import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.actions.Executor; -import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.util.Fingerprint; import com.google.devtools.build.lib.util.Preconditions; @@ -57,7 +56,7 @@ public final class BinaryFileWriteAction extends AbstractFileWriteAction { } @Override - public DeterministicWriter newDeterministicWriter(EventHandler eventHandler, Executor executor) { + public DeterministicWriter newDeterministicWriter(ActionExecutionContext ctx) { return new DeterministicWriter() { @Override public void writeOutputFile(OutputStream out) throws IOException { diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteAction.java index 01ae8eb8c1..1907f7c223 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteAction.java @@ -16,11 +16,10 @@ package com.google.devtools.build.lib.analysis.actions; import static java.nio.charset.StandardCharsets.UTF_8; +import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.ActionOwner; import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.analysis.RuleContext; -import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.util.Fingerprint; import java.io.IOException; @@ -100,8 +99,7 @@ public class FileWriteAction extends AbstractFileWriteAction { * {@link #getFileContents()}. */ @Override - public DeterministicWriter newDeterministicWriter(EventHandler eventHandler, - Executor executor) { + public DeterministicWriter newDeterministicWriter(ActionExecutionContext ctx) { return new DeterministicWriter() { @Override public void writeOutputFile(OutputStream out) throws IOException { diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionContext.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionContext.java index e019fb5826..2ddd813231 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionContext.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionContext.java @@ -15,10 +15,8 @@ package com.google.devtools.build.lib.analysis.actions; import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.ExecException; -import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.actions.Executor.ActionContext; import com.google.devtools.build.lib.actions.ResourceSet; -import com.google.devtools.build.lib.util.io.FileOutErr; /** * The action context for {@link AbstractFileWriteAction} instances (technically instances of @@ -29,8 +27,8 @@ public interface FileWriteActionContext extends ActionContext { /** * Performs all the setup and then calls back into the action to write the data. */ - void exec(Executor executor, AbstractFileWriteAction action, FileOutErr outErr, - ActionExecutionContext actionExecutionContext) throws ExecException, InterruptedException; + void exec(AbstractFileWriteAction action, ActionExecutionContext actionExecutionContext) + throws ExecException, InterruptedException; /** * Returns the estimated resource consumption of the action. diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/ParameterFileWriteAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/ParameterFileWriteAction.java index 2e92c6850e..939d9fc41e 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/ParameterFileWriteAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/ParameterFileWriteAction.java @@ -16,11 +16,10 @@ package com.google.devtools.build.lib.analysis.actions; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; +import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.ActionOwner; import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType; -import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.util.Fingerprint; import com.google.devtools.build.lib.util.ShellEscaper; @@ -68,7 +67,7 @@ public final class ParameterFileWriteAction extends AbstractFileWriteAction { } @Override - public DeterministicWriter newDeterministicWriter(EventHandler eventHandler, Executor executor) { + public DeterministicWriter newDeterministicWriter(ActionExecutionContext ctx) { return new DeterministicWriter() { @Override public void writeOutputFile(OutputStream out) throws IOException { diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionAction.java index 6e8275e0ca..10d4d7285b 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionAction.java @@ -19,10 +19,9 @@ import com.google.common.base.Joiner; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; +import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.ActionOwner; import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.actions.Executor; -import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.util.Fingerprint; import com.google.devtools.build.lib.util.ResourceFileLoader; import com.google.devtools.build.lib.util.StringUtilities; @@ -342,8 +341,7 @@ public class TemplateExpansionAction extends AbstractFileWriteAction { } @Override - public DeterministicWriter newDeterministicWriter(EventHandler eventHandler, - Executor executor) throws IOException { + public DeterministicWriter newDeterministicWriter(ActionExecutionContext ctx) throws IOException { final byte[] bytes = getFileContents().getBytes(Template.DEFAULT_CHARSET); return new DeterministicWriter() { @Override diff --git a/src/main/java/com/google/devtools/build/lib/exec/FileWriteStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/FileWriteStrategy.java index 1359363607..332cb8a783 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/FileWriteStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/exec/FileWriteStrategy.java @@ -19,13 +19,10 @@ import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.EnvironmentalExecException; import com.google.devtools.build.lib.actions.ExecException; import com.google.devtools.build.lib.actions.ExecutionStrategy; -import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.actions.ResourceSet; import com.google.devtools.build.lib.analysis.actions.AbstractFileWriteAction; import com.google.devtools.build.lib.analysis.actions.FileWriteActionContext; -import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.profiler.AutoProfiler; -import com.google.devtools.build.lib.util.io.FileOutErr; import com.google.devtools.build.lib.vfs.Path; import java.io.BufferedOutputStream; @@ -45,16 +42,16 @@ public final class FileWriteStrategy implements FileWriteActionContext { } @Override - public void exec(Executor executor, AbstractFileWriteAction action, FileOutErr outErr, - ActionExecutionContext actionExecutionContext) throws ExecException, InterruptedException { - EventHandler reporter = executor == null ? null : executor.getEventHandler(); + public void exec(AbstractFileWriteAction action, ActionExecutionContext actionExecutionContext) + throws ExecException, InterruptedException { + try (AutoProfiler p = AutoProfiler.logged( "running " + action.prettyPrint(), LOG, /*minTimeForLoggingInMilliseconds=*/ 100)) { try { Path outputPath = Iterables.getOnlyElement(action.getOutputs()).getPath(); try (OutputStream out = new BufferedOutputStream(outputPath.getOutputStream())) { - action.newDeterministicWriter(reporter, executor).writeOutputFile(out); + action.newDeterministicWriter(actionExecutionContext).writeOutputFile(out); } if (action.makeExecutable()) { outputPath.setExecutable(true); diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/WriteAdbArgsAction.java b/src/main/java/com/google/devtools/build/lib/rules/android/WriteAdbArgsAction.java index b6c7a5811b..0adf00840d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/WriteAdbArgsAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/WriteAdbArgsAction.java @@ -14,12 +14,11 @@ package com.google.devtools.build.lib.rules.android; import com.google.common.collect.ImmutableList; +import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.ActionOwner; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ExecException; -import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.analysis.actions.AbstractFileWriteAction; -import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.util.Fingerprint; import com.google.devtools.common.options.EnumConverter; import com.google.devtools.common.options.Option; @@ -89,15 +88,15 @@ public class WriteAdbArgsAction extends AbstractFileWriteAction { } @Override - public DeterministicWriter newDeterministicWriter(EventHandler eventHandler, Executor executor) + public DeterministicWriter newDeterministicWriter(ActionExecutionContext ctx) throws IOException, InterruptedException, ExecException { - Options options = executor.getOptions().getOptions(Options.class); + Options options = ctx.getExecutor().getOptions().getOptions(Options.class); final List<String> args = options.adbArgs; final String adb = options.adb; final int adbJobs = options.adbJobs; final String incrementalInstallVerbosity = options.incrementalInstallVerbosity; final StartType start = options.start; - final String userHomeDirectory = executor.getContext( + final String userHomeDirectory = ctx.getExecutor().getContext( WriteAdbArgsActionContext.class).getUserHomeDirectory(); return new DeterministicWriter() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java index 758a5bbd80..71e491d3e1 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java @@ -16,12 +16,11 @@ package com.google.devtools.build.lib.rules.cpp; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; +import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.ActionOwner; import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.actions.ResourceSet; import com.google.devtools.build.lib.analysis.actions.AbstractFileWriteAction; -import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.util.Fingerprint; import com.google.devtools.build.lib.vfs.PathFragment; @@ -85,7 +84,7 @@ public class CppModuleMapAction extends AbstractFileWriteAction { } @Override - public DeterministicWriter newDeterministicWriter(EventHandler eventHandler, Executor executor) { + public DeterministicWriter newDeterministicWriter(ActionExecutionContext ctx) { return new DeterministicWriter() { @Override public void writeOutputFile(OutputStream out) throws IOException { diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/WriteBuildInfoHeaderAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/WriteBuildInfoHeaderAction.java index c6843683f6..da42dfd6e3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/WriteBuildInfoHeaderAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/WriteBuildInfoHeaderAction.java @@ -18,12 +18,11 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; +import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.analysis.BuildInfoHelper; import com.google.devtools.build.lib.analysis.WorkspaceStatusAction; import com.google.devtools.build.lib.analysis.actions.AbstractFileWriteAction; -import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.util.Fingerprint; import com.google.devtools.build.lib.util.Preconditions; @@ -81,10 +80,10 @@ public final class WriteBuildInfoHeaderAction extends AbstractFileWriteAction { } @Override - public DeterministicWriter newDeterministicWriter(EventHandler eventHandler, Executor executor) + public DeterministicWriter newDeterministicWriter(ActionExecutionContext ctx) throws IOException { WorkspaceStatusAction.Context context = - executor.getContext(WorkspaceStatusAction.Context.class); + ctx.getExecutor().getContext(WorkspaceStatusAction.Context.class); final Map<String, WorkspaceStatusAction.Key> keys = new LinkedHashMap<>(); if (writeVolatileInfo) { diff --git a/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionInfoFileWriteAction.java b/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionInfoFileWriteAction.java index bb75bda3ba..bc3f79d61c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionInfoFileWriteAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionInfoFileWriteAction.java @@ -15,13 +15,12 @@ package com.google.devtools.build.lib.rules.extra; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.actions.Action; +import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.ActionOwner; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ExecException; -import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.actions.extra.ExtraActionInfo; import com.google.devtools.build.lib.analysis.actions.AbstractFileWriteAction; -import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.util.Fingerprint; import com.google.devtools.build.lib.util.Preconditions; @@ -46,7 +45,7 @@ public class ExtraActionInfoFileWriteAction extends AbstractFileWriteAction { } @Override - public DeterministicWriter newDeterministicWriter(EventHandler eventHandler, Executor executor) + public DeterministicWriter newDeterministicWriter(ActionExecutionContext ctx) throws IOException, InterruptedException, ExecException { return new DeterministicWriter() { // Instantiate the extra action info only on execution, so it is computed freshly each diff --git a/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java b/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java index 7be70e9f51..62fa681dc4 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java +++ b/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java @@ -21,8 +21,8 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder; import com.google.devtools.build.lib.analysis.RuleContext; @@ -150,8 +150,7 @@ public class GenQuery implements RuleConfiguredTargetFactory { new AbstractFileWriteAction( ruleContext.getActionOwner(), Collections.<Artifact>emptySet(), outputArtifact, false) { @Override - public DeterministicWriter newDeterministicWriter(EventHandler eventHandler, - Executor executor) { + public DeterministicWriter newDeterministicWriter(ActionExecutionContext ctx) { return new DeterministicWriter() { @Override public void writeOutputFile(OutputStream out) throws IOException { diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/WriteBuildInfoPropertiesAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/WriteBuildInfoPropertiesAction.java index ccf28724fa..a60c322d6b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/WriteBuildInfoPropertiesAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/WriteBuildInfoPropertiesAction.java @@ -18,13 +18,12 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; +import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.analysis.BuildInfoHelper; import com.google.devtools.build.lib.analysis.WorkspaceStatusAction; import com.google.devtools.build.lib.analysis.WorkspaceStatusAction.Key; import com.google.devtools.build.lib.analysis.actions.AbstractFileWriteAction; -import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.util.Fingerprint; import com.google.devtools.build.lib.util.Preconditions; @@ -144,14 +143,13 @@ public class WriteBuildInfoPropertiesAction extends AbstractFileWriteAction { } @Override - public DeterministicWriter newDeterministicWriter(EventHandler eventHandler, - final Executor executor) { + public DeterministicWriter newDeterministicWriter(final ActionExecutionContext ctx) { final long timestamp = System.currentTimeMillis(); return new DeterministicWriter() { @Override public void writeOutputFile(OutputStream out) throws IOException { WorkspaceStatusAction.Context context = - executor.getContext(WorkspaceStatusAction.Context.class); + ctx.getExecutor().getContext(WorkspaceStatusAction.Context.class); Map<String, String> values = new LinkedHashMap<>(); for (Artifact valueFile : valueArtifacts) { values.putAll(WorkspaceStatusAction.parseValues(valueFile.getPath())); diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/BaselineCoverageAction.java b/src/main/java/com/google/devtools/build/lib/rules/test/BaselineCoverageAction.java index 728584bbe6..20ae43eb27 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/test/BaselineCoverageAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/test/BaselineCoverageAction.java @@ -18,6 +18,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.eventbus.EventBus; +import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.ActionOwner; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.Executor; @@ -28,7 +29,6 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; -import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.util.Fingerprint; import com.google.devtools.build.lib.vfs.PathFragment; @@ -73,8 +73,7 @@ public final class BaselineCoverageAction extends AbstractFileWriteAction } @Override - public DeterministicWriter newDeterministicWriter(EventHandler eventHandler, - Executor executor) { + public DeterministicWriter newDeterministicWriter(ActionExecutionContext ctx) { return new DeterministicWriter() { @Override public void writeOutputFile(OutputStream out) throws IOException { diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/InstrumentedFileManifestAction.java b/src/main/java/com/google/devtools/build/lib/rules/test/InstrumentedFileManifestAction.java index 3c9daa6470..96224f0fb7 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/test/InstrumentedFileManifestAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/test/InstrumentedFileManifestAction.java @@ -19,12 +19,11 @@ import static java.nio.charset.StandardCharsets.ISO_8859_1; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; +import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.ActionOwner; import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.actions.AbstractFileWriteAction; -import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.util.Fingerprint; import com.google.devtools.build.lib.util.Preconditions; import com.google.devtools.build.lib.util.RegexFilter; @@ -57,7 +56,7 @@ class InstrumentedFileManifestAction extends AbstractFileWriteAction { } @Override - public DeterministicWriter newDeterministicWriter(EventHandler eventHandler, Executor executor) { + public DeterministicWriter newDeterministicWriter(ActionExecutionContext ctx) { return new DeterministicWriter() { @Override public void writeOutputFile(OutputStream out) throws IOException { |