Skip to content

Commit c8bde22

Browse files
benjaminpjohnynek
authored andcommitted
Simplify _jacoco_offline_instrument. (#790)
resolve_command shouldn't be required here.
1 parent 5db90f9 commit c8bde22

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

scala/private/rule_impls.bzl

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,10 +1335,6 @@ def _jacoco_offline_instrument(ctx, input_jar):
13351335
if not ctx.configuration.coverage_enabled or not hasattr(ctx.attr, "_code_coverage_instrumentation_worker"):
13361336
return _empty_coverage_struct
13371337

1338-
worker_inputs, _, worker_input_manifests = ctx.resolve_command(
1339-
tools = [ctx.attr._code_coverage_instrumentation_worker],
1340-
)
1341-
13421338
output_jar = ctx.actions.declare_file(
13431339
"{}-offline.jar".format(input_jar.basename.split(".")[0]),
13441340
)
@@ -1353,10 +1349,9 @@ def _jacoco_offline_instrument(ctx, input_jar):
13531349

13541350
ctx.actions.run(
13551351
mnemonic = "JacocoInstrumenter",
1356-
inputs = [in_out_pair[0] for in_out_pair in in_out_pairs] + worker_inputs,
1352+
inputs = [in_out_pair[0] for in_out_pair in in_out_pairs],
13571353
outputs = [in_out_pair[1] for in_out_pair in in_out_pairs],
1358-
executable = ctx.attr._code_coverage_instrumentation_worker.files_to_run.executable,
1359-
input_manifests = worker_input_manifests,
1354+
executable = ctx.attr._code_coverage_instrumentation_worker.files_to_run,
13601355
execution_requirements = {"supports-workers": "1"},
13611356
arguments = [args],
13621357
)

0 commit comments

Comments
 (0)