1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceMergingActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceMergingActionBuilder.java
index 3e7e853d57..ddf4e42bb0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceMergingActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceMergingActionBuilder.java
@@ -133,7 +133,7 @@ public class AndroidResourceMergingActionBuilder {
     // Use a FluentIterable to avoid flattening the NestedSets
     NestedSetBuilder<Artifact> inputs = NestedSetBuilder.naiveLinkOrder();
 
-    builder.addExecPath("--androidJar", sdk.getAndroidJar());
+    builder.add("--androidJar", sdk.getAndroidJar());
     inputs.add(sdk.getAndroidJar());
 
     Preconditions.checkNotNull(primary);
@@ -141,7 +141,7 @@ public class AndroidResourceMergingActionBuilder {
     inputs.addTransitive(RESOURCE_CONTAINER_TO_ARTIFACTS.apply(primary));
 
     Preconditions.checkNotNull(primary.getManifest());
-    builder.addExecPath("--primaryManifest", primary.getManifest());
+    builder.add("--primaryManifest", primary.getManifest());
     inputs.add(primary.getManifest());
 
     ResourceContainerConverter.convertDependencies(
@@ -149,19 +149,19 @@ public class AndroidResourceMergingActionBuilder {
 
     List<Artifact> outs = new ArrayList<>();
     if (classJarOut != null) {
-      builder.addExecPath("--classJarOutput", classJarOut);
+      builder.add("--classJarOutput", classJarOut);
       outs.add(classJarOut);
     }
 
     if (mergedResourcesOut != null) {
-      builder.addExecPath("--resourcesOutput", mergedResourcesOut);
+      builder.add("--resourcesOutput", mergedResourcesOut);
       outs.add(mergedResourcesOut);
     }
 
     // For now, do manifest processing to remove placeholders that aren't handled by the legacy
     // manifest merger. Remove this once enough users migrate over to the new manifest merger.
     if (manifestOut != null) {
-      builder.addExecPath("--manifestOutput", manifestOut);
+      builder.add("--manifestOutput", manifestOut);
       outs.add(manifestOut);
     }
 
@@ -174,7 +174,7 @@ public class AndroidResourceMergingActionBuilder {
     // TODO(corysmith): Move the data binding parsing out of the merging pass to enable faster
     // aapt2 builds.
     if (dataBindingInfoZip != null) {
-      builder.addExecPath("--dataBindingInfoOut", dataBindingInfoZip);
+      builder.add("--dataBindingInfoOut", dataBindingInfoZip);
       outs.add(dataBindingInfoZip);
     }