Automated rollback of commit 8d6fc64b18c7e35b93f5c43dae1dbd2f8cae2147.

PiperOrigin-RevId: 167480127

1 files changed, 8 insertions, 36 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
index 02e4149def..9e2e719532 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
@@ -21,7 +21,6 @@ import static com.google.devtools.build.lib.packages.ImplicitOutputsFunction.fro
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Streams;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.LanguageDependentFragment.LibraryLanguage;
 import com.google.devtools.build.lib.analysis.OutputGroupProvider;
@@ -32,10 +31,8 @@ import com.google.devtools.build.lib.analysis.Runfiles;
 import com.google.devtools.build.lib.analysis.Runfiles.Builder;
 import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
 import com.google.devtools.build.lib.analysis.actions.CustomCommandLine;
-import com.google.devtools.build.lib.analysis.actions.TemplateExpansionAction.ComputedSubstitution;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.packages.Attribute.LateBoundLabel;
 import com.google.devtools.build.lib.packages.Attribute.LateBoundLabelList;
@@ -49,10 +46,8 @@ import com.google.devtools.build.lib.rules.java.proto.GeneratedExtensionRegistry
 import com.google.devtools.build.lib.syntax.Type;
 import com.google.devtools.build.lib.util.FileType;
 import com.google.devtools.build.lib.vfs.PathFragment;
-import java.io.File;
 import java.util.Collection;
 import java.util.List;
-import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 
 /**
@@ -245,34 +240,7 @@ public interface JavaSemantics {
         }
       };
 
-  String JACOCO_METADATA_PLACEHOLDER = "%set_jacoco_metadata%";
-  String JACOCO_MAIN_CLASS_PLACEHOLDER = "%set_jacoco_main_class%";
-  String JACOCO_JAVA_RUNFILES_ROOT_PLACEHOLDER = "%set_jacoco_java_runfiles_root%";
-
-  /**
-   * Substitution for exporting the jars needed for jacoco coverage.
-   */
-  class ComputedJacocoSubstitution extends ComputedSubstitution {
-    private final NestedSet<Artifact> jars;
-    private final String pathPrefix;
-
-    public ComputedJacocoSubstitution(NestedSet<Artifact> jars, String workspacePrefix) {
-      super(JACOCO_METADATA_PLACEHOLDER);
-      this.jars = jars;
-      this.pathPrefix = "${JAVA_RUNFILES}/" + workspacePrefix;
-    }
-
-    /**
-     * Concatenating the root relative paths of the artifacts. Each relative path entry is prepended
-     * with "${JAVA_RUNFILES}" and the workspace prefix.
-     */
-    @Override
-    public String getValue() {
-      return Streams.stream(jars)
-          .map(artifact -> pathPrefix + "/" + artifact.getRootRelativePathString())
-          .collect(Collectors.joining(File.pathSeparator, "export JACOCO_METADATA_JARS=", ""));
-    }
-  }
+  String IJAR_LABEL = "//tools/defaults:ijar";
 
   /**
    * Verifies if the rule contains any errors.
@@ -343,8 +311,6 @@ public interface JavaSemantics {
       List<String> jvmFlags,
       Artifact executable,
       String javaStartClass,
-      String coverageStartClass,
-      NestedSetBuilder<Artifact> filesBuilder,
       String javaExecutable);
 
   /**
@@ -390,7 +356,13 @@ public interface JavaSemantics {
    *
    * @return new main class
    */
-  String addCoverageSupport(JavaCompilationHelper helper, Artifact executable)
+  String addCoverageSupport(
+      JavaCompilationHelper helper,
+      JavaTargetAttributes.Builder attributes,
+      Artifact executable,
+      Artifact instrumentationMetadata,
+      JavaCompilationArtifacts.Builder javaArtifactsBuilder,
+      String mainClass)
       throws InterruptedException;
 
   /**