1 files changed, 16 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AarGeneratorBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AarGeneratorBuilder.java
index 4a42915da3..41c5ab751d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AarGeneratorBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AarGeneratorBuilder.java
@@ -83,6 +83,12 @@ public class AarGeneratorBuilder {
     List<Artifact> outs = new ArrayList<>();
     List<Artifact> ins = new ArrayList<>();
     List<String> args = new ArrayList<>();
+    
+    // Set the busybox tool
+    args.add("--tool");
+    args.add("GENERATE_AAR");
+    // Deliminate between the tool and the tool arguments.
+    args.add("--");
 
     args.add("--mainData");
     addPrimaryResourceContainer(ins, args, primary);
@@ -109,15 +115,16 @@ public class AarGeneratorBuilder {
     args.add(aarOut.getExecPathString());
     outs.add(aarOut);
 
-    ruleContext.registerAction(this.builder
-        .addInputs(ImmutableList.<Artifact>copyOf(ins))
-        .addOutputs(ImmutableList.<Artifact>copyOf(outs))
-        .setCommandLine(CommandLine.of(args, false))
-        .setExecutable(
-            ruleContext.getExecutablePrerequisite("$android_aar_generator", Mode.HOST))
-        .setProgressMessage("Building AAR package for " + ruleContext.getLabel())
-        .setMnemonic("AARGenerator")
-        .build(context));
+    ruleContext.registerAction(
+        this.builder
+            .addInputs(ImmutableList.<Artifact>copyOf(ins))
+            .addOutputs(ImmutableList.<Artifact>copyOf(outs))
+            .setCommandLine(CommandLine.of(args, false))
+            .setExecutable(
+                ruleContext.getExecutablePrerequisite("$android_resources_busybox", Mode.HOST))
+            .setProgressMessage("Building AAR package for " + ruleContext.getLabel())
+            .setMnemonic("AARGenerator")
+            .build(context));
   }
 
   private void addPrimaryResourceContainer(List<Artifact> inputs, List<String> args,