Add option to dump command lines of actions in dump.

RELNOTES: None
PiperOrigin-RevId: 188164754

1 files changed, 15 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/ActionGraphDump.java b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/ActionGraphDump.java
index a606e34553..3a18d414c4 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/ActionGraphDump.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/ActionGraphDump.java
@@ -23,6 +23,7 @@ import com.google.devtools.build.lib.actions.ActionExecutionMetadata;
 import com.google.devtools.build.lib.actions.ActionKeyContext;
 import com.google.devtools.build.lib.actions.ActionOwner;
 import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.CommandLineExpansionException;
 import com.google.devtools.build.lib.analysis.AnalysisProtos;
 import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
@@ -56,9 +57,12 @@ public class ActionGraphDump {
   private final KnownNestedSets knownNestedSets;
   private final KnownAspectDescriptors knownAspectDescriptors;
   private final KnownRuleConfiguredTargets knownRuleConfiguredTargets;
+  private final boolean includeActionCmdLine;
 
-  public ActionGraphDump(List<String> actionGraphTargets) {
+  public ActionGraphDump(List<String> actionGraphTargets, boolean includeActionCmdLine) {
     this.actionGraphTargets = ImmutableSet.copyOf(actionGraphTargets);
+    this.includeActionCmdLine = includeActionCmdLine;
+
     knownRuleClassStrings = new KnownRuleClassStrings(actionGraphBuilder);
     knownArtifacts = new KnownArtifacts(actionGraphBuilder);
     knownConfigurations = new KnownConfigurations(actionGraphBuilder);
@@ -80,7 +84,8 @@ public class ActionGraphDump {
     return actionGraphTargets.contains(labelString);
   }
 
-  private void dumpSingleAction(ConfiguredTarget configuredTarget, ActionAnalysisMetadata action) {
+  private void dumpSingleAction(ConfiguredTarget configuredTarget, ActionAnalysisMetadata action)
+      throws CommandLineExpansionException {
     Preconditions.checkState(configuredTarget instanceof RuleConfiguredTarget);
     RuleConfiguredTarget ruleConfiguredTarget = (RuleConfiguredTarget) configuredTarget;
     AnalysisProtos.Action.Builder actionBuilder =
@@ -109,6 +114,10 @@ public class ActionGraphDump {
             .setValue(environmentVariable.getValue());
         actionBuilder.addEnvironmentVariables(keyValuePairBuilder.build());
       }
+
+      if (includeActionCmdLine) {
+        actionBuilder.addAllArguments(spawnAction.getArguments());
+      }
     }
 
     ActionOwner actionOwner = action.getOwner();
@@ -140,7 +149,8 @@ public class ActionGraphDump {
     actionGraphBuilder.addActions(actionBuilder.build());
   }
 
-  public void dumpAspect(AspectValue aspectValue, ConfiguredTargetValue configuredTargetValue) {
+  public void dumpAspect(AspectValue aspectValue, ConfiguredTargetValue configuredTargetValue)
+      throws CommandLineExpansionException {
     ConfiguredTarget configuredTarget = configuredTargetValue.getConfiguredTarget();
     if (!includeInActionGraph(configuredTarget.getLabel().toString())) {
       return;
@@ -151,7 +161,8 @@ public class ActionGraphDump {
     }
   }
 
-  public void dumpConfiguredTarget(ConfiguredTargetValue configuredTargetValue) {
+  public void dumpConfiguredTarget(ConfiguredTargetValue configuredTargetValue)
+      throws CommandLineExpansionException {
     ConfiguredTarget configuredTarget = configuredTargetValue.getConfiguredTarget();
     if (!includeInActionGraph(configuredTarget.getLabel().toString())) {
       return;