diff options
| author |  apell <apell@google.com> | 2017-10-17 19:51:38 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-10-18 10:28:23 +0200 |
| commit | d8f2e2d03c9469c612fe8cb2a1a9856c28e14c94 (patch) | |
| tree | 73c875e061b018c51a534b479661f18fe94faa63 /src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java | |
| parent | 20264552e18d8413f77b22b124e84e0267ce2b5e (diff) | |
Migrate ResourceProcessorBusyBox Android actions to using SHELL_QUOTED param files.
RELNOTES: None.
PiperOrigin-RevId: 172485548
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java index 51a67dbe34..84ab6f9161 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java @@ -146,7 +146,7 @@ public class AndroidResourceParsingActionBuilder { builder.addExecPath("--output", output); SpawnAction.Builder spawnActionBuilder = new SpawnAction.Builder(); - ParamFileInfo.Builder paramFileInfo = ParamFileInfo.builder(ParameterFileType.UNQUOTED); + ParamFileInfo.Builder paramFileInfo = ParamFileInfo.builder(ParameterFileType.SHELL_QUOTED); // Some flags (e.g. --mainData) may specify lists (or lists of lists) separated by special // characters (colon, semicolon, hashmark, ampersand) that don't work on Windows, and quoting // semantics are very complicated (more so than in Bash), so let's just always use a parameter @@ -199,9 +199,7 @@ public class AndroidResourceParsingActionBuilder { .useDefaultShellEnvironment() .addTransitiveInputs(inputs.build()) .addOutputs(ImmutableList.copyOf(outs)) - .addCommandLine( - flatFileBuilder.build(), - ParamFileInfo.builder(ParameterFileType.UNQUOTED).build()) + .addCommandLine(flatFileBuilder.build(), paramFileInfo.build()) .setExecutable( ruleContext.getExecutablePrerequisite("$android_resources_busybox", Mode.HOST)) .setProgressMessage("Compiling Android resources for %s", ruleContext.getLabel()) |