Skip to content

Commit 89dc283

Browse files
committed
Simplify _jacoco_offline_instrument.
resolve_command shouldn't be required here.
1 parent e4d55ed commit 89dc283

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
@@ -1333,10 +1333,6 @@ def _jacoco_offline_instrument(ctx, input_jar):
13331333
if not ctx.configuration.coverage_enabled or not hasattr(ctx.attr, "_code_coverage_instrumentation_worker"):
13341334
return _empty_coverage_struct
13351335

1336-
worker_inputs, _, worker_input_manifests = ctx.resolve_command(
1337-
tools = [ctx.attr._code_coverage_instrumentation_worker],
1338-
)
1339-
13401336
output_jar = ctx.actions.declare_file(
13411337
"{}-offline.jar".format(input_jar.basename.split(".")[0]),
13421338
)
@@ -1351,10 +1347,9 @@ def _jacoco_offline_instrument(ctx, input_jar):
13511347

13521348
ctx.actions.run(
13531349
mnemonic = "JacocoInstrumenter",
1354-
inputs = [in_out_pair[0] for in_out_pair in in_out_pairs] + worker_inputs,
1350+
inputs = [in_out_pair[0] for in_out_pair in in_out_pairs],
13551351
outputs = [in_out_pair[1] for in_out_pair in in_out_pairs],
1356-
executable = ctx.attr._code_coverage_instrumentation_worker.files_to_run.executable,
1357-
input_manifests = worker_input_manifests,
1352+
executable = ctx.attr._code_coverage_instrumentation_worker.files_to_run,
13581353
execution_requirements = {"supports-workers": "1"},
13591354
arguments = [args],
13601355
)

0 commit comments

Comments
 (0)