diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/java/ResourceJarActionBuilder.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/ResourceJarActionBuilder.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/ResourceJarActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/java/ResourceJarActionBuilder.java index 0d9cf42e02..4f5643c97a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/ResourceJarActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/ResourceJarActionBuilder.java @@ -25,6 +25,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.CustomCommandLine; +import com.google.devtools.build.lib.analysis.actions.ParamFileInfo; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; @@ -123,6 +124,7 @@ public class ResourceJarActionBuilder { if (!classpathResources.isEmpty()) { command.addExecPaths("--classpath_resources", classpathResources); } + ParamFileInfo paramFileInfo = null; // TODO(b/37444705): remove this logic and always call useParameterFile once the bug is fixed // Most resource jar actions are very small and expanding the argument list for // ParamFileHelper#getParamsFileMaybe is expensive, so avoid doing that work if @@ -132,7 +134,7 @@ public class ResourceJarActionBuilder { if (sizeGreaterThanOrEqual( Iterables.concat(messages, resources.values(), resourceJars, classpathResources), 10) || ruleContext.getConfiguration().getMinParamFileSize() < 10000) { - builder.useParameterFile(ParameterFileType.SHELL_QUOTED); + paramFileInfo = ParamFileInfo.builder(ParameterFileType.SHELL_QUOTED).build(); } ruleContext.registerAction( builder @@ -141,7 +143,7 @@ public class ResourceJarActionBuilder { .addInputs(resources.values()) .addTransitiveInputs(resourceJars) .addInputs(classpathResources) - .setCommandLine(command.build()) + .addCommandLine(command.build(), paramFileInfo) .setProgressMessage("Building Java resource jar") .setMnemonic(MNEMONIC) .build(ruleContext)); |