Automated rollback of commit 52c4d05d1bfd54ea901e9926be7b262dd45e34de.

*** Reason for rollback ***

http://b/109733929

*** Original change description ***

Add LabelLateBoundDefault to :coverage_report_generator attribute

RELNOTES:none
PiperOrigin-RevId: 199308190

1 files changed, 2 insertions, 15 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
index aa45dba3a1..2e5c1d56c9 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
@@ -92,17 +92,6 @@ public class BaseRuleClasses {
         (rule, attributes, configuration) -> configuration.getCoverageSupport());
   }
 
-  public static final String DEFAULT_COVERAGE_REPORT_GENERATOR_VALUE =
-      "//tools/test:coverage_report_generator";
-
-  public static LabelLateBoundDefault<TestConfiguration> coverageReportGeneratorAttribute(
-      Label defaultValue) {
-    return LabelLateBoundDefault.fromTargetConfiguration(
-        TestConfiguration.class,
-        defaultValue,
-        (rule, attributes, configuration) -> configuration.getCoverageReportGenerator());
-  }
-
   // TODO(b/65746853): provide a way to do this without passing the entire configuration
   /** Implementation for the :run_under attribute. */
   @AutoCodec
@@ -178,11 +167,9 @@ public class BaseRuleClasses {
                       coverageSupportAttribute(env.getToolsLabel(DEFAULT_COVERAGE_SUPPORT_VALUE))))
           // Used in the one-per-build coverage report generation action.
           .add(
-              attr(":coverage_report_generator", LABEL)
+              attr("$coverage_report_generator", LABEL)
                   .cfg(HostTransition.INSTANCE)
-                  .value(
-                      coverageReportGeneratorAttribute(
-                          env.getToolsLabel(DEFAULT_COVERAGE_REPORT_GENERATOR_VALUE)))
+                  .value(env.getLabel("//tools/defaults:coverage_report_generator"))
                   .singleArtifact())
 
           // The target itself and run_under both run on the same machine. We use the DATA config