Change param file arg string to a format string instead of a prefix string.

Makes it easier to do Skylark param file support which uses a format string.

PiperOrigin-RevId: 169019600

1 files changed, 3 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
index ac9aa7266a..a6af9fc364 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
@@ -1327,8 +1327,8 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie
           result.add((String) value);
         } else if (value instanceof Artifact) {
           Artifact paramFile = (Artifact) value;
-          String flag = (String) values[++i];
-          result.add(flag + paramFile.getExecPathString());
+          String flagFormatString = (String) values[++i];
+          result.add(flagFormatString.replaceFirst("%s", paramFile.getExecPathString()));
         } else if (value instanceof CommandLine) {
           CommandLine commandLine = (CommandLine) value;
           if (artifactExpander != null) {
@@ -1351,7 +1351,7 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie
 
       Builder addParamFile(Artifact paramFile, ParamFileInfo paramFileInfo) {
         values.add(paramFile);
-        values.add(paramFileInfo.getFlag());
+        values.add(paramFileInfo.getFlagFormatString());
         return this;
       }