Add a crunch_png attribute to android_binary

This allows a user to turn off png crunching during
the final merge (with crunch_png = 0), but it does
not skip nine-patch processing.

RELNOTES: adds crunch_png attribute to android_binary

--
MOS_MIGRATED_REVID=119986498

5 files changed, 33 insertions, 3 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 fb2ec1acbb..48a8a931cd 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
@@ -204,6 +204,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
           null, /* Artifact symbolsTxt */
           ruleContext.getTokenizedStringListAttr("resource_configuration_filters"),
           ruleContext.getTokenizedStringListAttr("nocompress_extensions"),
+          ruleContext.attributes().get("crunch_png", Type.BOOLEAN),
           ruleContext.getTokenizedStringListAttr("densities"),
           ruleContext.attributes().get("application_id", Type.STRING),
           getExpandedMakeVarsForAttr(ruleContext, "version_code"),
@@ -225,6 +226,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
               null, /* Artifact symbolsTxt */
               ruleContext.getTokenizedStringListAttr("resource_configuration_filters"),
               ruleContext.getTokenizedStringListAttr("nocompress_extensions"),
+              ruleContext.attributes().get("crunch_png", Type.BOOLEAN),
               ruleContext.getTokenizedStringListAttr("densities"),
               ruleContext.attributes().get("application_id", Type.STRING),
               getExpandedMakeVarsForAttr(ruleContext, "version_code"),
@@ -246,6 +248,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
               null, /* Artifact symbolsTxt */
               ruleContext.getTokenizedStringListAttr("resource_configuration_filters"),
               ruleContext.getTokenizedStringListAttr("nocompress_extensions"),
+              ruleContext.attributes().get("crunch_png", Type.BOOLEAN),
               ruleContext.getTokenizedStringListAttr("densities"),
               ruleContext.attributes().get("application_id", Type.STRING),
               getExpandedMakeVarsForAttr(ruleContext, "version_code"),
@@ -258,6 +261,12 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
         return null;
       }
     } else {
+      if (!ruleContext.attributes().get("crunch_png", Type.BOOLEAN)) {
+        ruleContext.ruleError("Setting crunch_png = 0 is not supported for android_binary"
+            + " rules which depend on android_resources rules.");
+        return null;
+      }
+
       // Retrieve the resources from the resources attribute on the android_binary rule
       // and recompile them if necessary.
       ApplicationManifest resourcesManifest = ApplicationManifest.fromResourcesRule(ruleContext);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryOnlyRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryOnlyRule.java
index fc297e5224..8dc3672bb2 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryOnlyRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryOnlyRule.java
@@ -16,6 +16,7 @@ package com.google.devtools.build.lib.rules.android;
 import static com.google.devtools.build.lib.packages.Attribute.ConfigurationTransition.HOST;
 import static com.google.devtools.build.lib.packages.Attribute.attr;
 import static com.google.devtools.build.lib.packages.BuildType.LABEL;
+import static com.google.devtools.build.lib.syntax.Type.BOOLEAN;
 import static com.google.devtools.build.lib.syntax.Type.STRING;
 import static com.google.devtools.build.lib.syntax.Type.STRING_LIST;
 
@@ -71,6 +72,11 @@ public final class AndroidBinaryOnlyRule implements RuleDefinition {
         A list of file extension to leave uncompressed in apk.
         <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
         .add(attr("nocompress_extensions", STRING_LIST))
+        /* <!-- #BLAZE_RULE(android_binary).ATTRIBUTE(crunch_png) -->
+        Do PNG crunching (or not). This is independent of nine-patch processing, which is always
+        done. Currently only supported for local resources (not android_resources).
+        <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
+        .add(attr("crunch_png", BOOLEAN).value(true))
         /* <!-- #BLAZE_RULE(android_binary).ATTRIBUTE(resource_configuration_filters) -->
         A list of resource configuration filters, such 'en' that will limit the resources in the
         apk to only the ones in the 'en' configuration.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
index 529e10f7b7..642cac823d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
@@ -88,6 +88,7 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory {
           ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_SYMBOLS_TXT),
           ImmutableList.<String>of(), /* configurationFilters */
           ImmutableList.<String>of(), /* uncompressedExtensions */
+          false, /* crunchPng */
           ImmutableList.<String>of(), /* densities */
           null /* applicationId */,
           null /* versionCode */,
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java
index 3e4ec6b69b..2c3606f1e1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java
@@ -78,6 +78,7 @@ public class AndroidResourcesProcessorBuilder {
   private Artifact manifestOut;
   private Artifact mergedResourcesOut;
   private boolean isLibrary;
+  private boolean crunchPng = true;
 
   /**
    * @param ruleContext The RuleContext that was used to create the SpawnAction.Builder.
@@ -108,6 +109,11 @@ public class AndroidResourcesProcessorBuilder {
     return this;
   }
 
+  public AndroidResourcesProcessorBuilder setCrunchPng(boolean crunchPng) {
+    this.crunchPng = crunchPng;
+    return this;
+  }
+
   public AndroidResourcesProcessorBuilder setDensities(List<String> densities) {
     this.densities = densities;
     return this;
@@ -325,6 +331,9 @@ public class AndroidResourcesProcessorBuilder {
     if (!uncompressedExtensions.isEmpty()) {
       builder.addJoinStrings("--uncompressedExtensions", ",", uncompressedExtensions);
     }
+    if (!crunchPng) {
+      builder.add("--useAaptCruncher=no");
+    }
     if (!assetsToIgnore.isEmpty()) {
       builder.addJoinStrings("--assetsToIgnore", ",", assetsToIgnore);
     }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java b/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java
index 05df106d88..0a66657ef0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java
@@ -211,13 +211,14 @@ public final class ApplicationManifest {
         false, /* isLibrary */
         resourceDeps,
         rTxt,
-        null, /* configurationFilters */
+        null, /* symbolsTxt */
+        ImmutableList.<String>of(), /* configurationFilters */
         ImmutableList.<String>of(), /* uncompressedExtensions */
+        true, /* crunchPng */
         ImmutableList.<String>of(), /* densities */
-        ImmutableList.<String>of(), /* String applicationId */
+        null, /* String applicationId */
         null, /* String versionCode */
         null, /* String versionName */
-        null, /* Artifact symbolsTxt */
         incremental,
         data,
         proguardCfg,
@@ -237,6 +238,7 @@ public final class ApplicationManifest {
       Artifact symbolsTxt,
       List<String> configurationFilters,
       List<String> uncompressedExtensions,
+      boolean crunchPng,
       List<String> densities,
       String applicationId,
       String versionCode,
@@ -269,6 +271,7 @@ public final class ApplicationManifest {
         symbolsTxt,
         configurationFilters,
         uncompressedExtensions,
+        crunchPng,
         densities,
         applicationId,
         versionCode,
@@ -288,6 +291,7 @@ public final class ApplicationManifest {
       Artifact symbolsTxt,
       List<String> configurationFilters,
       List<String> uncompressedExtensions,
+      boolean crunchPng,
       List<String> densities,
       String applicationId,
       String versionCode,
@@ -319,6 +323,7 @@ public final class ApplicationManifest {
             .setApkOut(resourceContainer.getApk())
             .setConfigurationFilters(configurationFilters)
             .setUncompressedExtensions(uncompressedExtensions)
+            .setCrunchPng(crunchPng)
             .setJavaPackage(resourceContainer.getJavaPackage())
             .setDebug(ruleContext.getConfiguration().getCompilationMode() != CompilationMode.OPT)
             .setManifestOut(manifestOut)