1 files changed, 3 insertions, 7 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 b6445e304f..982b07f35f 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
@@ -203,8 +203,7 @@ public abstract class ProguardHelper {
         deployJar,
         semantics,
         /* optimizationPases */ 3,
-        proguardOutputMap,
-        /* useSingleJarForProguardLibraryJars */ false);
+        proguardOutputMap);
   }
 
   private ImmutableList<Artifact> collectProguardSpecs(
@@ -372,8 +371,6 @@ public abstract class ProguardHelper {
    * @param optimizationPasses if not null specifies to break proguard up into multiple passes with
    *        the given number of optimization passes.
    * @param proguardOutputMap mapping generated by Proguard if requested. could be null.
-   * @param useSingleJarForProguardLibraryJars whether to combine all library jars into a single jar
-   *        file before processing with Proguard
    */
   public static ProguardOutput createOptimizationActions(RuleContext ruleContext,
       FilesToRunProvider proguard,
@@ -386,8 +383,7 @@ public abstract class ProguardHelper {
       Artifact proguardOutputJar,
       JavaSemantics semantics,
       @Nullable Integer optimizationPasses,
-      @Nullable Artifact proguardOutputMap,
-      boolean useSingleJarForProguardLibraryJars) throws InterruptedException {
+      @Nullable Artifact proguardOutputMap) throws InterruptedException {
     JavaOptimizationMode optMode = getJavaOptimizationMode(ruleContext);
     Preconditions.checkArgument(optMode != JavaOptimizationMode.NOOP);
     Preconditions.checkArgument(optMode != JavaOptimizationMode.LEGACY || !proguardSpecs.isEmpty());
@@ -397,7 +393,7 @@ public abstract class ProguardHelper {
             proguardOutputMap);
 
 
-    if (useSingleJarForProguardLibraryJars && Iterables.size(libraryJars) > 1) {
+    if (Iterables.size(libraryJars) > 1) {
       JavaTargetAttributes attributes = new JavaTargetAttributes.Builder(semantics)
           .build();
       Artifact combinedLibraryJar = getProguardTempArtifact(ruleContext,