commit fcfe560386811507132e021769cf3b46ed1c86a4
author Jingwen Chen <jingwen@google.com> Wed Aug 07 18:28:46 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Aug 07 18:29:48 2019 -0700
tree 53e936f8f4caec5eb3a0e9eeec8c1ec3caffab3a
parent 00e9d16d69b191bdfdc32bfd6b2bed203e5af844

Fix Android builds with aapt2 on Windows, part 1

Error messages: https://github.com/bazelbuild/bazel/issues/9102#issuecomment-519171351

Closes #9118.

PiperOrigin-RevId: 262258777

src/main/java/com/google/devtools/build/lib/rules/android/BusyBoxActionBuilder.java

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 eb61855..bbb6579 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
@@ -223,21 +223,15 @@
   /**
    * Adds an efficient flag and inputs based on transitive values.
    *
-   * <p>Each value will be separated on the command line by the host-specific path separator.
+   * <p>Each value will be separated on the command line by the ':' character, the option parser's
+   * PathListConverter delimiter.
    *
    * <p>Unlike other transitive input methods in this class, this method adds the values to both the
    * command line and the list of inputs.
    */
   public BusyBoxActionBuilder addTransitiveVectoredInput(
       @CompileTimeConstant String arg, NestedSet<Artifact> values) {
-    commandLine.addExecPaths(
-        arg,
-        VectorArg.join(
-                dataContext
-                    .getActionConstructionContext()
-                    .getConfiguration()
-                    .getHostPathSeparator())
-            .each(values));
+    commandLine.addExecPaths(arg, VectorArg.join(":").each(values));
     inputs.addTransitive(values);
     return this;
   }