Rollback of commit 8dc4257b9493bd2251636de1271a1972c17919ef.

--
MOS_MIGRATED_REVID=131692718

1 files changed, 3 insertions, 57 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/ProguardHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/ProguardHelper.java
index 565da35671..e4daee2693 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/ProguardHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/ProguardHelper.java
@@ -32,6 +32,7 @@ import com.google.devtools.build.lib.packages.AttributeMap;
 import com.google.devtools.build.lib.packages.BuildType;
 import com.google.devtools.build.lib.rules.java.JavaConfiguration.JavaOptimizationMode;
 import com.google.devtools.build.lib.syntax.Type;
+
 import javax.annotation.Nullable;
 
 /**
@@ -52,21 +53,15 @@ public abstract class ProguardHelper {
     private final Artifact outputJar;
     @Nullable private final Artifact mapping;
     @Nullable private final Artifact protoMapping;
-    @Nullable private final Artifact seeds;
-    @Nullable private final Artifact usage;
     private final Artifact config;
 
     public ProguardOutput(Artifact outputJar,
                           @Nullable Artifact mapping,
                           @Nullable Artifact protoMapping,
-                          @Nullable Artifact seeds,
-                          @Nullable Artifact usage,
                           Artifact config) {
       this.outputJar = checkNotNull(outputJar);
       this.mapping = mapping;
       this.protoMapping = protoMapping;
-      this.seeds = seeds;
-      this.usage = usage;
       this.config = config;
     }
 
@@ -84,16 +79,6 @@ public abstract class ProguardHelper {
       return protoMapping;
     }
 
-    @Nullable
-    public Artifact getSeeds() {
-      return seeds;
-    }
-
-    @Nullable
-    public Artifact getUsage() {
-      return usage;
-    }
-
     public Artifact getConfig() {
       return config;
     }
@@ -107,12 +92,6 @@ public abstract class ProguardHelper {
       if (protoMapping != null) {
         filesBuilder.add(protoMapping);
       }
-      if (seeds != null) {
-        filesBuilder.add(seeds);
-      }
-      if (usage != null) {
-        filesBuilder.add(usage);
-      }
       if (config != null) {
         filesBuilder.add(config);
       }
@@ -285,22 +264,11 @@ public abstract class ProguardHelper {
       proguardOutputProtoMap = semantics.getProtoMapping(ruleContext);
     }
 
-    Artifact proguardOutputSeeds =
-        ruleContext.getImplicitOutputArtifact(JavaSemantics.JAVA_BINARY_PROGUARD_SEEDS);
-
-    Artifact proguardOutputUsage =
-        ruleContext.getImplicitOutputArtifact(JavaSemantics.JAVA_BINARY_PROGUARD_USAGE);
-
     Artifact proguardConfigOutput =
         ruleContext.getImplicitOutputArtifact(JavaSemantics.JAVA_BINARY_PROGUARD_CONFIG);
 
     return new ProguardOutput(
-        outputJar,
-        proguardOutputMap,
-        proguardOutputProtoMap,
-        proguardOutputSeeds,
-        proguardOutputUsage,
-        proguardConfigOutput);
+        outputJar, proguardOutputMap, proguardOutputProtoMap, proguardConfigOutput);
   }
 
   /**
@@ -335,7 +303,7 @@ public abstract class ProguardHelper {
     Preconditions.checkArgument(optMode != JavaOptimizationMode.LEGACY || !proguardSpecs.isEmpty());
 
     ProguardOutput output = getProguardOutputs(proguardOutputJar, ruleContext, semantics);
-
+    
     if (optimizationPasses == null) {
       // Run proguard as a single step.
       Builder builder = makeBuilder(
@@ -347,8 +315,6 @@ public abstract class ProguardHelper {
           output.getOutputJar(),
           output.getMapping(),
           output.getProtoMapping(),
-          output.getSeeds(),
-          output.getUsage(),
           output.getConfig())
           .setProgressMessage("Trimming binary with Proguard")
           .addOutput(proguardOutputJar);
@@ -368,8 +334,6 @@ public abstract class ProguardHelper {
               output.getOutputJar(),
               /* proguardOutputMap */ null,
               /* proguardOutputProtoMap */ null,
-              /* proguardOutputSeeds */ null,
-              /* proguardOutputUsage */ null,
               /* proguardConfigOutput */ null)
               .setProgressMessage("Trimming binary with Proguard: Verification/Shrinking Pass")
               .addArgument("-runtype INITIAL")
@@ -390,8 +354,6 @@ public abstract class ProguardHelper {
                 output.getOutputJar(),
                 /* proguardOutputMap */ null,
                 /* proguardOutputProtoMap */ null,
-                /* proguardOutputSeeds */ null,
-                /* proguardOutputUsage */ null,
                 /* proguardConfigOutput */ null)
                 .setProgressMessage("Trimming binary with Proguard: Optimization Pass " + (i + 1))
                 .addArgument("-runtype OPTIMIZATION")
@@ -412,8 +374,6 @@ public abstract class ProguardHelper {
           output.getOutputJar(),
           output.getMapping(),
           output.getProtoMapping(),
-          output.getSeeds(),
-          output.getUsage(),
           output.getConfig())
           .setProgressMessage("Trimming binary with Proguard: Obfuscation and Final Ouput Pass")
           .addArgument("-runtype FINAL")
@@ -436,8 +396,6 @@ public abstract class ProguardHelper {
       Artifact proguardOutputJar,
       @Nullable Artifact proguardOutputMap,
       @Nullable Artifact proguardOutputProtoMap,
-      @Nullable Artifact proguardOutputSeeds,
-      @Nullable Artifact proguardOutputUsage,
       @Nullable Artifact proguardConfigOutput) {
 
     Builder builder = new SpawnAction.Builder()
@@ -484,18 +442,6 @@ public abstract class ProguardHelper {
           .addOutputArgument(proguardOutputProtoMap);
     }
 
-    if (proguardOutputSeeds != null) {
-      builder
-          .addArgument("-printseeds")
-          .addOutputArgument(proguardOutputSeeds);
-    }
-
-    if (proguardOutputUsage != null) {
-      builder
-          .addArgument("-printusage")
-          .addOutputArgument(proguardOutputUsage);
-    }
-
     if (proguardConfigOutput != null) {
       builder
           .addArgument("-printconfiguration")