Add the contents of the main_dex_list attribute to the command line of the main_dex_list binary when android_sdk is used.

--
MOS_MIGRATED_REVID=94167520

1 files changed, 7 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidTools.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidTools.java
index b7a057dc0c..5e57c27e04 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidTools.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidTools.java
@@ -249,12 +249,17 @@ public class AndroidTools {
    * its executable already set to invoke the main dex list creator.
    */
   public Action[] mainDexListAction(Artifact jar, Artifact strippedJar, Artifact mainDexList) {
+    SpawnAction.Builder builder = new SpawnAction.Builder()
+        .setMnemonic("MainDexClasses")
+        .setProgressMessage("Generating main dex classes list");
+
     if (androidSdk != null) {
-      return new SpawnAction.Builder()
+      return builder
           .setExecutable(androidSdk.getMainDexListCreator())
           .addOutputArgument(mainDexList)
           .addInputArgument(strippedJar)
           .addInputArgument(jar)
+          .addArguments(ruleContext.getTokenizedStringListAttr("main_dex_list_opts"))
           .build(ruleContext);
     } else {
       StringBuilder shellCommandBuilder = new StringBuilder()
@@ -270,14 +275,12 @@ public class AndroidTools {
           .append(" ").append(jar.getExecPathString())
           .append(" >").append(mainDexList.getExecPathString());
 
-      return new SpawnAction.Builder()
+      return builder
           .addInput(strippedJar)
           .addInput(jar)
           .addInput(dxJar)
           .addTransitiveInputs(BaseJavaCompilationHelper.getHostJavabaseInputs(ruleContext))
           .addOutput(mainDexList)
-          .setProgressMessage("Generating main dex classes list")
-          .setMnemonic("MainDexClasses")
           .setShellCommand(shellCommandBuilder.toString())
           .build(ruleContext);
     }