1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java
index 49ef64770c..0c40818e16 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java
@@ -100,9 +100,9 @@ public class RClassGeneratorActionBuilder {
     if (dependencies != null) {
       // TODO(corysmith): Remove NestedSet as we are already flattening it.
       Iterable<ResourceContainer> depResources = dependencies.getResources();
-      if (depResources.iterator().hasNext()) {
-        builder.addJoinStrings(
-            "--libraries", ",", Iterables.transform(depResources, chooseDepsToArg(version)));
+      if (!Iterables.isEmpty(depResources)) {
+        builder.addBeforeEach(
+            "--library", Iterables.transform(depResources, chooseDepsToArg(version)));
         inputs.addTransitive(
             NestedSetBuilder.wrap(
                 Order.NAIVE_LINK_ORDER,
@@ -159,7 +159,7 @@ public class RClassGeneratorActionBuilder {
       public String apply(ResourceContainer container) {
         Artifact rTxt = chooseRTxt(container, version);
         return (rTxt != null ? rTxt.getExecPath() : "")
-            + ":"
+            + ","
             + (container.getManifest() != null ? container.getManifest().getExecPath() : "");
       }
     };