diff options
| author |  apell <apell@google.com> | 2017-08-29 18:36:17 +0200 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-08-29 18:53:13 +0200 |
| commit | 687d6c449a336cd5f9667cf0b15b0f7a26d6c103 (patch) | |
| tree | cfb65b65057a868b40567f0c777b5ac395417ac4 /src/main/java/com/google/devtools/build/lib/rules | |
| parent | adda51294125a335e9b3fad9c72c00b8de54b766 (diff) | |
Rollforward of https://github.com/bazelbuild/bazel/commit/0071b396776be4d146fd271499716dd5dea6f7e9: Enable parameter files for manifest merger actions.
NEW: Using shell quoted param files and unescape arguments in ParamsFilePreProcessor to avoid miss-processing --manifestValues arguments containing whitespace.
RELNOTES: None.
PiperOrigin-RevId: 166858411
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/ManifestMergerActionBuilder.java | 4 |
1 files changed, 3 insertions, 1 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( |