[Android] Support aapt-generated main dex specs.

Add bazel support for using the "aapt -D" command to generate a proguard
specification for components which need to be in the main dex.

--
MOS_MIGRATED_REVID=121531584

1 files changed, 11 insertions, 0 deletions

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 2c3606f1e1..7967f92934 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
@@ -58,6 +58,7 @@ public class AndroidResourcesProcessorBuilder {
   private ResourceContainer primary;
   private ResourceDependencies dependencies;
   private Artifact proguardOut;
+  private Artifact mainDexProguardOut;
   private Artifact rTxtOut;
   private Artifact sourceJarOut;
   private boolean debug = false;
@@ -134,6 +135,11 @@ public class AndroidResourcesProcessorBuilder {
     return this;
   }
 
+  public AndroidResourcesProcessorBuilder setMainDexProguardOut(Artifact mainDexProguardCfg) {
+    this.mainDexProguardOut = mainDexProguardCfg;
+    return this;
+  }
+
   public AndroidResourcesProcessorBuilder setRTxtOut(Artifact rTxtOut) {
     this.rTxtOut = rTxtOut;
     return this;
@@ -308,6 +314,11 @@ public class AndroidResourcesProcessorBuilder {
       outs.add(proguardOut);
     }
 
+    if (mainDexProguardOut != null) {
+      builder.addExecPath("--mainDexProguardOutput", mainDexProguardOut);
+      outs.add(mainDexProguardOut);
+    }
+
     if (manifestOut != null) {
       builder.addExecPath("--manifestOutput", manifestOut);
       outs.add(manifestOut);