diff options
author | 2018-08-02 06:47:19 -0700 | |
---|---|---|
committer | 2018-08-02 06:48:54 -0700 | |
commit | d4d3d506f4cf6cfaafaeeb717d681ff7784e2384 (patch) | |
tree | 0dd0aad48aadde21b44d6153b3489bcd882ba904 /src/main/java/com/google/devtools/build/lib/skyframe/RunfilesArtifactValue.java | |
parent | dcd7c63d09e12fc3e2a9ca80b1422e4bcdd2740f (diff) |
remote: add support for directory inputs in runfiles
Add support for tree artifacts (ctx.action.declare_directory(...)) in
runfiles. Before this change we would throw away the information
about the files inside a tree artifact before executing an action.
That's fine for local execution where the sandbox just copies/symlinks
a directory and doesn't care much what's inside. However, in remote
execution we actually need to upload each individual file and so
we need to be aware of all individual files not just directories.
This change makes it so that this information is made available to a
SpawnRunner via the SpawnInputExpander.
RELNOTES: None
PiperOrigin-RevId: 207091668
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/RunfilesArtifactValue.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/RunfilesArtifactValue.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RunfilesArtifactValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/RunfilesArtifactValue.java index 644bd5e331..ebb4acf87c 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/RunfilesArtifactValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/RunfilesArtifactValue.java @@ -21,7 +21,9 @@ import com.google.devtools.build.lib.util.Pair; /** The artifacts behind a runfiles middleman. */ class RunfilesArtifactValue extends AggregatingArtifactValue { RunfilesArtifactValue( - ImmutableList<Pair<Artifact, FileArtifactValue>> inputs, FileArtifactValue selfData) { - super(inputs, selfData); + ImmutableList<Pair<Artifact, FileArtifactValue>> fileInputs, + ImmutableList<Pair<Artifact, TreeArtifactValue>> directoryInputs, + FileArtifactValue selfData) { + super(fileInputs, directoryInputs, selfData); } } |