2 files changed, 13 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ManifestMergerActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/ManifestMergerActionBuilder.java
index 0f0c682ffb..1203a2faab 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ManifestMergerActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ManifestMergerActionBuilder.java
@@ -140,7 +140,9 @@ public class ManifestMergerActionBuilder {
       // list-type and list-of-list-type flags that use such problematic separators in favor of
       // multi-value flags (to remove one level of listing) and by changing all list separators to a
       // platform-safe character (= comma).
-      this.spawnActionBuilder.alwaysUseParameterFile(ParameterFileType.UNQUOTED);
+      spawnActionBuilder.alwaysUseParameterFile(ParameterFileType.SHELL_QUOTED);
+    } else {
+      spawnActionBuilder.useParameterFile(ParameterFileType.SHELL_QUOTED);
     }
 
     ruleContext.registerAction(
diff --git a/src/main/java/com/google/devtools/common/options/ParamsFilePreProcessor.java b/src/main/java/com/google/devtools/common/options/ParamsFilePreProcessor.java
index 30b67ed55e..791265ae1b 100644
--- a/src/main/java/com/google/devtools/common/options/ParamsFilePreProcessor.java
+++ b/src/main/java/com/google/devtools/common/options/ParamsFilePreProcessor.java
@@ -68,7 +68,7 @@ public class ParamsFilePreProcessor implements ArgsPreProcessor {
         while (iterator.hasNext()) {
           char next = iterator.next();
           if (Character.isWhitespace(next) && !iterator.isInQuote() && !iterator.isEscaped()) {
-            newArgs.add(arg.toString());
+            newArgs.add(unescape(arg.toString()));
             arg = new StringBuilder();
           } else {
             arg.append(next);
@@ -92,6 +92,14 @@ public class ParamsFilePreProcessor implements ArgsPreProcessor {
     return args;
   }
 
+  private String unescape(String arg) {
+    if (arg.startsWith("'") && arg.endsWith("'")) {
+      String unescaped = arg.replace("'\\''", "'");
+      return unescaped.substring(1, unescaped.length() - 1);
+    }
+    return arg;
+  }
+
   // Doesn't implement iterator to avoid autoboxing and to throw exceptions.
   static class CharIterator {
 
@@ -145,7 +153,7 @@ public class ParamsFilePreProcessor implements ArgsPreProcessor {
         throw new NoSuchElementException();
       }
       char current = (char) reader.read();
-      
+
       // check for \r\n line endings. If found, drop the \r for normalized parsing.
       if (current == '\r' && peek() == '\n') {
         current = (char) reader.read();