diff options
| author |  tomlu <tomlu@google.com> | 2017-09-14 23:24:06 +0200 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2017-09-15 11:29:04 +0200 |
| commit | 7df9198a771ef2eabef396dcb7a21e6cbb3cabb0 (patch) | |
| tree | e8929823a7012639db9a560589b89beacecdb757 /src/main/java/com/google/devtools/build/lib/rules/android/AndroidAaptActionHelper.java | |
| parent | 2e7b804d29f3c1fa979d8a226d62d970dada64e2 (diff) | |
Support multiple command lines / params files in SpawnAction.
This is necessary for the upcoming Skylark implementation of param files.
PiperOrigin-RevId: 168744486
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidAaptActionHelper.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidAaptActionHelper.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAaptActionHelper.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAaptActionHelper.java index 3a5d8d35ce..310c7f655b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAaptActionHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAaptActionHelper.java @@ -21,6 +21,7 @@ import com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType; import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.actions.CommandLine; +import com.google.devtools.build.lib.analysis.actions.ParamFileInfo; 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.config.CompilationMode; @@ -108,8 +109,8 @@ public final class AndroidAaptActionHelper { .setExecutable( ruleContext.getExecutablePrerequisite("$android_aapt_java_generator", Mode.HOST)) .addOutput(javaSourcesJar) - .setCommandLine(CommandLine.of(args)) - .useParameterFile(ParameterFileType.UNQUOTED) + .addCommandLine( + CommandLine.of(args), ParamFileInfo.builder(ParameterFileType.UNQUOTED).build()) .setProgressMessage("Generating Java resources") .setMnemonic("AaptJavaGenerator"); if (rTxt != null) { @@ -149,8 +150,8 @@ public final class AndroidAaptActionHelper { .addOutput(apk) .setExecutable( ruleContext.getExecutablePrerequisite("$android_aapt_apk_generator", Mode.HOST)) - .setCommandLine(CommandLine.of(args)) - .useParameterFile(ParameterFileType.UNQUOTED) + .addCommandLine( + CommandLine.of(args), ParamFileInfo.builder(ParameterFileType.UNQUOTED).build()) .setProgressMessage("Generating apk resources") .setMnemonic("AaptResourceApk") .build(ruleContext)); @@ -277,8 +278,9 @@ public final class AndroidAaptActionHelper { .addOutputs(outputs.build()) .setExecutable( ruleContext.getExecutablePrerequisite("$android_aapt_apk_generator", Mode.HOST)) - .setCommandLine(CommandLine.of(aaptCommand)) - .useParameterFile(ParameterFileType.UNQUOTED) + .addCommandLine( + CommandLine.of(aaptCommand), + ParamFileInfo.builder(ParameterFileType.UNQUOTED).build()) .setProgressMessage("Generating Proguard configuration for resources") .setMnemonic("AaptProguardConfiguration") .build(ruleContext)); |