1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java
index fb0c79d19f..b38898a8dd 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java
@@ -20,6 +20,7 @@ import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode;
 import com.google.devtools.build.lib.analysis.RuleContext;
 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;
 import com.google.devtools.build.lib.analysis.config.CompilationMode;
 import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException;
@@ -170,10 +171,11 @@ public class ResourceShrinkerActionBuilder {
     inputs.add(sdk.getAndroidJar());
 
     if (!uncompressedExtensions.isEmpty()) {
-      commandLine.addJoined("--uncompressedExtensions", ",", uncompressedExtensions);
+      commandLine.addAll(
+          "--uncompressedExtensions", VectorArg.join(",").each(uncompressedExtensions));
     }
     if (!assetsToIgnore.isEmpty()) {
-      commandLine.addJoined("--assetsToIgnore", ",", assetsToIgnore);
+      commandLine.addAll("--assetsToIgnore", VectorArg.join(",").each(assetsToIgnore));
     }
     if (ruleContext.getConfiguration().getCompilationMode() != CompilationMode.OPT) {
       commandLine.add("--debug");
@@ -213,7 +215,7 @@ public class ResourceShrinkerActionBuilder {
 
     ImmutableList<String> resourcePackages =
         getResourcePackages(primaryResources, dependencyResources);
-    commandLine.addJoined("--resourcePackages", ",", resourcePackages);
+    commandLine.addAll("--resourcePackages", VectorArg.join(",").each(resourcePackages));
 
     commandLine.addExecPath("--shrunkResourceApk", resourceApkOut);
     outputs.add(resourceApkOut);