From 89dc283c64772a21a6d3f98a32960593ff3d20df Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Thu, 18 Jul 2019 17:43:06 -0700 Subject: [PATCH] Simplify _jacoco_offline_instrument. resolve_command shouldn't be required here. --- scala/private/rule_impls.bzl | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/scala/private/rule_impls.bzl b/scala/private/rule_impls.bzl index 3b9a526263..5fb8587834 100644 --- a/scala/private/rule_impls.bzl +++ b/scala/private/rule_impls.bzl @@ -1333,10 +1333,6 @@ def _jacoco_offline_instrument(ctx, input_jar): if not ctx.configuration.coverage_enabled or not hasattr(ctx.attr, "_code_coverage_instrumentation_worker"): return _empty_coverage_struct - worker_inputs, _, worker_input_manifests = ctx.resolve_command( - tools = [ctx.attr._code_coverage_instrumentation_worker], - ) - output_jar = ctx.actions.declare_file( "{}-offline.jar".format(input_jar.basename.split(".")[0]), ) @@ -1351,10 +1347,9 @@ def _jacoco_offline_instrument(ctx, input_jar): ctx.actions.run( mnemonic = "JacocoInstrumenter", - inputs = [in_out_pair[0] for in_out_pair in in_out_pairs] + worker_inputs, + inputs = [in_out_pair[0] for in_out_pair in in_out_pairs], outputs = [in_out_pair[1] for in_out_pair in in_out_pairs], - executable = ctx.attr._code_coverage_instrumentation_worker.files_to_run.executable, - input_manifests = worker_input_manifests, + executable = ctx.attr._code_coverage_instrumentation_worker.files_to_run, execution_requirements = {"supports-workers": "1"}, arguments = [args], )