Revert JacocoCoverage target to remote_java_tools_java_import and add…

… a new target for remore_java_tools_filegroup. (bazelbuild#12813) JacocoCoverage target is used in downstream projects.
katre · Jan 13, 2021 · 4158a6f · 4158a6f
1 parent 6a60b30
commit 4158a6f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
@@ -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",

diff --git a/tools/jdk/default_java_toolchain.bzl b/tools/jdk/default_java_toolchain.bzl
@@ -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",