diff options
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java index 9c91ece4a3..244c0ed1e7 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java @@ -46,7 +46,6 @@ import com.google.devtools.build.lib.analysis.Runfiles; import com.google.devtools.build.lib.analysis.RunfilesProvider; import com.google.devtools.build.lib.analysis.actions.CustomCommandLine; import com.google.devtools.build.lib.analysis.actions.CustomCommandLine.VectorArg; -import com.google.devtools.build.lib.analysis.actions.ParameterFileWriteAction; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.analysis.actions.SpawnAction.Builder; import com.google.devtools.build.lib.analysis.actions.SpawnActionTemplate; @@ -1289,26 +1288,19 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { .addExecPath("--output", outputZip) .add("--no_duplicates") // safety: expect distinct entry names in all inputs .build(); - // Must use params file as otherwise expanding the input tree artifact doesn't work - Artifact paramFile = - ruleContext.getDerivedArtifact( - ParameterFile.derivePath(outputZip.getRootRelativePath()), outputZip.getRoot()); - ruleContext.registerAction( - new ParameterFileWriteAction( - ruleContext.getActionOwner(), - ImmutableList.of(inputTree), - paramFile, - args, - ParameterFile.ParameterFileType.SHELL_QUOTED, - ISO_8859_1)); ruleContext.registerAction( singleJarSpawnActionBuilder(ruleContext) .setMnemonic("MergeDexZips") .setProgressMessage("Merging dex shards for %s", ruleContext.getLabel()) .addInput(inputTree) - .addInput(paramFile) .addOutput(outputZip) - .addCommandLine(CustomCommandLine.builder().addPrefixedExecPath("@", paramFile).build()) + // Must use params file as otherwise expanding the input tree artifact doesn't work + .addCommandLine( + args, + ParamFileInfo.builder(ParameterFile.ParameterFileType.SHELL_QUOTED) + .setCharset(ISO_8859_1) + .setUseAlways(true) + .build()) .build(ruleContext)); } |