1 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java
index 01c4e6b89b..9c46ee398e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java
@@ -34,6 +34,7 @@ import com.google.devtools.build.lib.analysis.RunfilesProvider;
 import com.google.devtools.build.lib.analysis.RunfilesSupport;
 import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
 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.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.rules.android.AndroidLibraryAarProvider.Aar;
@@ -255,12 +256,14 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor
 
     CustomCommandLine.Builder cmdLineArgs = CustomCommandLine.builder();
     if (!transitiveAars.isEmpty()) {
-      cmdLineArgs.addJoined(
-          "--android_libraries", ",", transitiveAars, AndroidLocalTestBase::aarCmdLineArg);
+      cmdLineArgs.addAll(
+          "--android_libraries",
+          VectorArg.join(",").each(transitiveAars).mapped(AndroidLocalTestBase::aarCmdLineArg));
     }
     if (!strictAars.isEmpty()) {
-      cmdLineArgs.addJoined(
-          "--strict_libraries", ",", strictAars, AndroidLocalTestBase::aarCmdLineArg);
+      cmdLineArgs.addAll(
+          "--strict_libraries",
+          VectorArg.join(",").each(strictAars).mapped(AndroidLocalTestBase::aarCmdLineArg));
     }
     RunfilesSupport runfilesSupport =
         RunfilesSupport.withExecutable(