commit 4b4403f9ef6f174dcb94c8370d3e9643eb5dd280
author tomlu <tomlu@google.com> Mon Aug 28 19:33:50 2017 +0200
committer Vladimir Moskva <vladmos@google.com> Tue Aug 29 13:31:30 2017 +0200
tree 2b2f07d96e0b0e033b8cb766bf4d6f02fdd91d3a
parent 2ae3eaea447820c5fd33f3b3eeb1cb0f9df4768c

Use CustomCommandLine directly instead of via SpawnAction.Builder.

This change forces use of CustomCommandLine.Builder, which has a richer interface for constructing memory-efficient command lines. It will also permit surveying the code base for inefficient patterns using an IDE.

This change was done by hand and split using Rosie to assist with rollbacks in case of bugs. Reviewers, please pay particular attention to:

* Each all to addInputArgument/addOutputArgument should come with a corresponding matching pair to SpawnAction.Builder#addInput and CustomCommandLine.Builder#addExecPath (eg.).
* The commandLine must be set on the SpawnAction using SpawnAction.Builder#setCommandLine.

Note that most calls to addPrefixed("arg=", val) should be more idiomatically expressed as add("arg", val), but this involves changing tests and making sure that the command line tools can accept the format.

PiperOrigin-RevId: 166723076

src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
index 222ae75..87f43cc 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
@@ -32,6 +32,7 @@
 import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.StaticallyLinkedMarkerProvider;
 import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
+import com.google.devtools.build.lib.analysis.actions.CustomCommandLine;
 import com.google.devtools.build.lib.analysis.actions.SpawnAction;
 import com.google.devtools.build.lib.analysis.actions.SymlinkAction;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
@@ -660,10 +661,10 @@
             .addOutput(output)
             .useDefaultShellEnvironment()
             .setExecutable(stripTool.getToolPath(cppConfiguration.getCrosstoolTopPathFragment()))
-            .addArguments(commandLine)
             .setExecutionInfo(executionInfoBuilder.build())
             .setProgressMessage("Stripping %s for %s", output.prettyPrint(), context.getLabel())
             .setMnemonic("CcStrip")
+            .setCommandLine(CustomCommandLine.builder().addAll(commandLine).build())
             .build(context);
     context.registerAction(stripAction);
   }