1 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/BusyBoxActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/BusyBoxActionBuilder.java
index 16e55f8993..07552fe2c1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/BusyBoxActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/BusyBoxActionBuilder.java
@@ -18,7 +18,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.ParamFileInfo;
 import com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType;
-import com.google.devtools.build.lib.analysis.FilesToRunProvider;
 import com.google.devtools.build.lib.analysis.actions.CustomCommandLine;
 import com.google.devtools.build.lib.analysis.actions.CustomCommandLine.VectorArg;
 import com.google.devtools.build.lib.analysis.actions.SpawnAction;
@@ -50,7 +49,7 @@ public final class BusyBoxActionBuilder {
   private final AndroidDataContext dataContext;
   private final NestedSetBuilder<Artifact> inputs = NestedSetBuilder.naiveLinkOrder();
   private final ImmutableList.Builder<Artifact> outputs = ImmutableList.builder();
-  private final SpawnAction.Builder spawnActionBuilder = new SpawnAction.Builder();
+  private final ImmutableList.Builder<Artifact> tools = ImmutableList.builder();
   private final CustomCommandLine.Builder commandLine = CustomCommandLine.builder();
 
   public static BusyBoxActionBuilder create(
@@ -288,16 +287,16 @@ public final class BusyBoxActionBuilder {
 
   /** Adds aapt to the command line and inputs. */
   public BusyBoxActionBuilder addAapt(AndroidAaptVersion aaptVersion) {
-    FilesToRunProvider aapt;
+    Artifact aapt;
     if (aaptVersion == AndroidAaptVersion.AAPT2) {
-      aapt = dataContext.getSdk().getAapt2();
-      commandLine.addExecPath("--aapt2", aapt.getExecutable());
+      aapt = dataContext.getSdk().getAapt2().getExecutable();
+      commandLine.addExecPath("--aapt2", aapt);
     } else {
-      aapt = dataContext.getSdk().getAapt();
-      commandLine.addExecPath("--aapt", aapt.getExecutable());
+      aapt = dataContext.getSdk().getAapt().getExecutable();
+      commandLine.addExecPath("--aapt", aapt);
     }
 
-    spawnActionBuilder.addTool(aapt);
+    tools.add(aapt);
 
     return this;
   }
@@ -316,10 +315,11 @@ public final class BusyBoxActionBuilder {
    */
   public void buildAndRegister(String message, String mnemonic) {
     dataContext.registerAction(
-        spawnActionBuilder
+        new SpawnAction.Builder()
             .useDefaultShellEnvironment()
             .addTransitiveInputs(inputs.build())
             .addOutputs(outputs.build())
+            .addTools(tools.build())
             .addCommandLine(commandLine.build(), FORCED_PARAM_FILE_INFO)
             .setExecutable(dataContext.getBusybox())
             .setProgressMessage("%s for %s", message, dataContext.getLabel())