Skip to content

Commit 4158a6f

Browse files
comiusmeisterT
authored andcommitted
Revert JacocoCoverage target to remote_java_tools_java_import and add a new target for remore_java_tools_filegroup. (#12813)
JacocoCoverage target is used in downstream projects.
1 parent 6a60b30 commit 4158a6f

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

tools/jdk/BUILD

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,11 +271,16 @@ remote_java_tools_java_import(
271271
target = ":java_tools/JacocoCoverage_jarjar_deploy.jar",
272272
)
273273

274-
remote_java_tools_filegroup(
274+
remote_java_tools_java_import(
275275
name = "JacocoCoverage",
276276
target = ":java_tools/JacocoCoverage_jarjar_deploy.jar",
277277
)
278278

279+
remote_java_tools_filegroup(
280+
name = "JacocoCoverageFilegroup",
281+
target = ":java_tools/JacocoCoverage_jarjar_deploy.jar",
282+
)
283+
279284
remote_java_tools_java_import(
280285
name = "TestRunner",
281286
target = ":java_tools/Runner_deploy.jar",

tools/jdk/default_java_toolchain.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ DEFAULT_TOOLCHAIN_CONFIGURATION = {
5656
"header_compiler_direct": ["@bazel_tools//tools/jdk:turbine_direct"],
5757
"ijar": ["@bazel_tools//tools/jdk:ijar"],
5858
"javabuilder": ["@bazel_tools//tools/jdk:javabuilder"],
59-
"jacocorunner": "@bazel_tools//tools/jdk:JacocoCoverage",
59+
"jacocorunner": "@bazel_tools//tools/jdk:JacocoCoverageFilegroup",
6060
"tools": [
6161
"@bazel_tools//tools/jdk:javac_jar",
6262
"@bazel_tools//tools/jdk:java_compiler_jar",

0 commit comments

Comments
 (0)