From f3ae88ee043846e7acdffd645137075a4e72c573 Mon Sep 17 00:00:00 2001
From: Googler <noreply@google.com>
Date: Wed, 3 May 2017 00:40:13 +0200
Subject: Flag cleanup (Step 1 of 3): Make
 use_singlejar_for_proguard_libraryjars a no-op, and default behavior to on
 since it has been on in the global blazerc for awhile now.

RELNOTES: Deprecate use_singlejar_for_proguard_libraryjars and force behavior to always on.
PiperOrigin-RevId: 154890445
---
 .../google/devtools/build/lib/rules/android/AndroidBinary.java |  3 +--
 .../devtools/build/lib/rules/android/AndroidConfiguration.java |  9 ++-------
 .../google/devtools/build/lib/rules/java/ProguardHelper.java   | 10 +++-------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
index 1fe14d84f7..6b3e06393a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
@@ -1095,8 +1095,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
         proguardOutputJar,
         javaSemantics,
         getProguardOptimizationPasses(ruleContext),
-        proguardOutputMap,
-        ruleContext.getFragment(AndroidConfiguration.class).useSingleJarForProguardLibraryJars());
+        proguardOutputMap);
     return result;
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
index 1b7f5556cd..bc33ad361a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
@@ -487,11 +487,12 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     // other settings default to empty and are set or modified via dynamic configuration.
     public ResourceFilter resourceFilter;
 
+    // TODO(b/33043897) - remove this once removed from global blazerc.
     @Option(
       name = "use_singlejar_for_proguard_libraryjars",
       defaultValue = "false",
       optionUsageRestrictions = OptionUsageRestrictions.UNDOCUMENTED,
-      help = "Use SingleJar to combine all ProGuard library jars."
+      help = "Unused flag."
     )
     public boolean useSingleJarForProguardLibraryJars;
 
@@ -604,7 +605,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
   private final ApkSigningMethod apkSigningMethod;
   private final boolean useSingleJarApkBuilder;
   private final ResourceFilter resourceFilter;
-  private final boolean useSingleJarForProguardLibraryJars;
   private final boolean compressJavaResources;
   private final boolean includeLibraryResourceJars;
   private final boolean useNocompressExtensionsOnApk;
@@ -634,7 +634,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     this.manifestMerger = options.manifestMerger;
     this.apkSigningMethod = options.apkSigningMethod;
     this.useSingleJarApkBuilder = options.useSingleJarApkBuilder;
-    this.useSingleJarForProguardLibraryJars = options.useSingleJarForProguardLibraryJars;
     this.useRexToCompressDexFiles = options.useRexToCompressDexFiles;
     this.resourceFilter = options.resourceFilter;
     this.compressJavaResources = options.compressJavaResources;
@@ -740,10 +739,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     return resourceFilter;
   }
 
-  public boolean useSingleJarForProguardLibraryJars() {
-    return useSingleJarForProguardLibraryJars;
-  }
-
   boolean compressJavaResources() {
     return compressJavaResources;
   }
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,
-- 
cgit v1.2.3