commit 2d90b6a807bd123ac149255a63d6180c93734cba
author Googler <noreply@google.com> Thu Jul 26 12:37:34 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Thu Jul 26 12:38:54 2018 -0700
tree 7e0d8b4fb2ac071f07e9aa4524ee7870d5b02369
parent ecceb0cbe28e45280458fa01633baf442cf2666d

Keep track of tree artifact inputs in CustomCommandLine.Builder .

PiperOrigin-RevId: 206203357

src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
index 8dab651..9e2ca29 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
@@ -1831,6 +1831,9 @@
           if (allowedFileTypes.apply(sourceArtifact.getFilename())) {
             return;
           }
+          if (sourceArtifact.isTreeArtifact()) {
+            return;
+          }
         }
         attributeError(
             attribute.getName(),

src/main/java/com/google/devtools/build/lib/analysis/actions/CustomCommandLine.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/CustomCommandLine.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/CustomCommandLine.java
index 43ea957..0cd8d5c 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/CustomCommandLine.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/CustomCommandLine.java
@@ -717,6 +717,11 @@
       return arguments.isEmpty();
     }
 
+    private final ImmutableList.Builder<Artifact> treeArtifactInputs =
+        new ImmutableList.Builder<>();
+
+    private boolean treeArtifactsRequested = false;
+
     /**
      * Adds a constant-value string.
      *
@@ -1022,6 +1027,8 @@
      */
     public Builder addPlaceholderTreeArtifactExecPath(@Nullable Artifact treeArtifact) {
       if (treeArtifact != null) {
+        Preconditions.checkState(!treeArtifactsRequested);
+        treeArtifactInputs.add(treeArtifact);
         arguments.add(new TreeFileArtifactExecPathArg(treeArtifact));
       }
       return this;
@@ -1039,6 +1046,8 @@
     public Builder addPlaceholderTreeArtifactExecPath(String arg, @Nullable Artifact treeArtifact) {
       Preconditions.checkNotNull(arg);
       if (treeArtifact != null) {
+        Preconditions.checkState(!treeArtifactsRequested);
+        treeArtifactInputs.add(treeArtifact);
         arguments.add(arg);
         arguments.add(new TreeFileArtifactExecPathArg(treeArtifact));
       }
@@ -1052,6 +1061,8 @@
      * @param treeArtifact the TreeArtifact containing the {@link TreeFileArtifact}s to add.
      */
     public Builder addExpandedTreeArtifactExecPaths(Artifact treeArtifact) {
+      Preconditions.checkState(!treeArtifactsRequested);
+      treeArtifactInputs.add(treeArtifact);
       Preconditions.checkNotNull(treeArtifact);
       arguments.add(new ExpandedTreeArtifactArg(treeArtifact));
       return this;
@@ -1060,6 +1071,8 @@
     public Builder addExpandedTreeArtifactExecPaths(String arg, Artifact treeArtifact) {
       Preconditions.checkNotNull(arg);
       Preconditions.checkNotNull(treeArtifact);
+      Preconditions.checkState(!treeArtifactsRequested);
+      treeArtifactInputs.add(treeArtifact);
       arguments.add(
           new ExpandedTreeArtifactArg(
               treeArtifact, artifact -> ImmutableList.of(arg, artifact.getExecPathString())));
@@ -1077,10 +1090,18 @@
     public Builder addExpandedTreeArtifact(
         Artifact treeArtifact, Function<Artifact, Iterable<String>> expandFunction) {
       Preconditions.checkNotNull(treeArtifact);
+      Preconditions.checkState(!treeArtifactsRequested);
+      treeArtifactInputs.add(treeArtifact);
       arguments.add(new ExpandedTreeArtifactArg(treeArtifact, expandFunction));
       return this;
     }
 
+    /** Gets all the tree artifact inputs for command line */
+    public Iterable<Artifact> getTreeArtifactInputs() {
+      treeArtifactsRequested = true;
+      return treeArtifactInputs.build();
+    }
+
     public CustomCommandLine build() {
       return new CustomCommandLine(arguments);
     }