Automated rollback of commit 411039319c1c67f2b9c8a7ada9e0a11d9bd4023f.

*** Reason for rollback ***

Breaks coverage for android_test (N/A).

Can be reproduced with unknown commit.

*** Original change description ***

Rollforward change of Java coverage logic.

RELNOTES: None.

*** Original change description ***

Automated rollback of commit 8d6fc64b18c7e35b93f5c43dae1dbd2f8cae2147.

PiperOrigin-RevId: 170322801

1 files changed, 15 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java
index 423b13af36..6ac746f904 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java
@@ -126,6 +126,8 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor
     JavaCompilationHelper helper =
         getJavaCompilationHelperWithDependencies(ruleContext, javaSemantics, javaCommon,
             attributesBuilder);
+    Artifact instrumentationMetadata =
+        helper.createInstrumentationMetadata(classJar, javaArtifactsBuilder);
     Artifact executable; // the artifact for the rule itself
     if (OS.getCurrent() == OS.WINDOWS
         && ruleContext.getConfiguration().enableWindowsExeLauncher()) {
@@ -152,7 +154,7 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor
             javaSemantics,
             helper,
             executable,
-            null,
+            instrumentationMetadata,
             javaArtifactsBuilder,
             attributesBuilder);
 
@@ -176,7 +178,11 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor
         helper.createOutputDepsProtoArtifact(classJar, javaArtifactsBuilder);
     javaRuleOutputJarsProviderBuilder.setJdeps(outputDepsProtoArtifact);
     helper.createCompileAction(
-        classJar, manifestProtoOutput, genSourceJar, outputDepsProtoArtifact);
+        classJar,
+        manifestProtoOutput,
+        genSourceJar,
+        outputDepsProtoArtifact,
+        instrumentationMetadata);
     helper.createSourceJarAction(srcJar, genSourceJar);
 
     setUpJavaCommon(javaCommon, helper, javaArtifactsBuilder.build());
@@ -196,8 +202,6 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor
         getJvmFlags(ruleContext, testClass),
         executable,
         mainClass,
-        "com.google.testing.junit.runner.GoogleTestRunner",
-        filesToBuildBuilder,
         javaExecutable);
 
     Artifact deployJar =
@@ -431,6 +435,13 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor
     builder.addTargets(depsForRunfiles, RunfilesProvider.DEFAULT_RUNFILES);
     builder.addTransitiveArtifacts(transitiveAarArtifacts);
 
+    if (ruleContext.getConfiguration().isCodeCoverageEnabled()) {
+      Artifact instrumentedJar = javaCommon.getJavaCompilationArtifacts().getInstrumentedJar();
+      if (instrumentedJar != null) {
+        builder.addArtifact(instrumentedJar);
+      }
+    }
+
     // We assume that the runtime jars will not have conflicting artifacts
     // with the same root relative path
     builder.addTransitiveArtifactsWrappedInStableOrder(javaCommon.getRuntimeClasspath());
@@ -467,4 +478,3 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor
     return testClass;
   }
 }
-