From 4158a6f512e52516437e00f8d9609a91be7fc195 Mon Sep 17 00:00:00 2001 From: Ivo List Date: Tue, 12 Jan 2021 19:11:08 +0100 Subject: [PATCH] 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. --- tools/jdk/BUILD | 7 ++++++- tools/jdk/default_java_toolchain.bzl | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index 13f575a8afb0c5..fd5c31e01ff693 100644 --- 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 index 2fe21259c01abc..89b8c95a717068 100644 --- 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",