[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, 7 insertions, 0 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AaptCommandBuilder.java b/src/tools/android/java/com/google/devtools/build/android/AaptCommandBuilder.java
index 83591e73d5..d1f5a54dcb 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AaptCommandBuilder.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AaptCommandBuilder.java
@@ -83,6 +83,13 @@ class AaptCommandBuilder {
     return this;
   }
 
+  AaptCommandBuilder maybeAdd(String flag, @Nullable Path path, FullRevision requiredVersion) {
+    if (buildToolsVersion == null || buildToolsVersion.compareTo(requiredVersion) >= 0) {
+      add(flag, path);
+    }
+    return this;
+  }
+
   AaptCommandBuilder maybeAdd(String flag, FullRevision requiredVersion) {
     if (buildToolsVersion == null || buildToolsVersion.compareTo(requiredVersion) >= 0) {
       add(flag);