Skip to content

Commit

Permalink
Revert JacocoCoverage target to remote_java_tools_java_import and add…
Browse files Browse the repository at this point in the history
… a new target for remore_java_tools_filegroup. (#12813)

JacocoCoverage target is used in downstream projects.
  • Loading branch information
comius authored and meisterT committed Jan 13, 2021
1 parent 6a60b30 commit 4158a6f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion tools/jdk/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -271,11 +271,16 @@ remote_java_tools_java_import(
target = ":java_tools/JacocoCoverage_jarjar_deploy.jar",
)

remote_java_tools_filegroup(
remote_java_tools_java_import(
name = "JacocoCoverage",
target = ":java_tools/JacocoCoverage_jarjar_deploy.jar",
)

remote_java_tools_filegroup(
name = "JacocoCoverageFilegroup",
target = ":java_tools/JacocoCoverage_jarjar_deploy.jar",
)

remote_java_tools_java_import(
name = "TestRunner",
target = ":java_tools/Runner_deploy.jar",
Expand Down
2 changes: 1 addition & 1 deletion tools/jdk/default_java_toolchain.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ DEFAULT_TOOLCHAIN_CONFIGURATION = {
"header_compiler_direct": ["@bazel_tools//tools/jdk:turbine_direct"],
"ijar": ["@bazel_tools//tools/jdk:ijar"],
"javabuilder": ["@bazel_tools//tools/jdk:javabuilder"],
"jacocorunner": "@bazel_tools//tools/jdk:JacocoCoverage",
"jacocorunner": "@bazel_tools//tools/jdk:JacocoCoverageFilegroup",
"tools": [
"@bazel_tools//tools/jdk:javac_jar",
"@bazel_tools//tools/jdk:java_compiler_jar",
Expand Down

0 comments on commit 4158a6f

Please sign in to comment.