diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/actions')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java | 17 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/actions/Artifact.java | 9 |
2 files changed, 17 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java b/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java index 44a79f9314..7be226f7ff 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java +++ b/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java @@ -63,8 +63,7 @@ public class ActionExecutionContext implements Closeable { private final MetadataHandler metadataHandler; private final FileOutErr fileOutErr; private final ImmutableMap<String, String> clientEnv; - private final ImmutableMap<PathFragment, ImmutableList<FilesetOutputSymlink>> - inputFilesetMappings; + private final ImmutableMap<PathFragment, ImmutableList<FilesetOutputSymlink>> topLevelFilesets; @Nullable private final ArtifactExpander artifactExpander; @Nullable private final Environment env; @@ -83,7 +82,7 @@ public class ActionExecutionContext implements Closeable { MetadataHandler metadataHandler, FileOutErr fileOutErr, Map<String, String> clientEnv, - ImmutableMap<PathFragment, ImmutableList<FilesetOutputSymlink>> inputFilesetMappings, + ImmutableMap<PathFragment, ImmutableList<FilesetOutputSymlink>> topLevelFilesets, @Nullable ArtifactExpander artifactExpander, @Nullable SkyFunction.Environment env, @Nullable FileSystem actionFileSystem, @@ -94,7 +93,7 @@ public class ActionExecutionContext implements Closeable { this.metadataHandler = metadataHandler; this.fileOutErr = fileOutErr; this.clientEnv = ImmutableMap.copyOf(clientEnv); - this.inputFilesetMappings = inputFilesetMappings; + this.topLevelFilesets = topLevelFilesets; this.executor = executor; this.artifactExpander = artifactExpander; this.env = env; @@ -113,7 +112,7 @@ public class ActionExecutionContext implements Closeable { MetadataHandler metadataHandler, FileOutErr fileOutErr, Map<String, String> clientEnv, - ImmutableMap<PathFragment, ImmutableList<FilesetOutputSymlink>> inputFilesetMappings, + ImmutableMap<PathFragment, ImmutableList<FilesetOutputSymlink>> topLevelFilesets, ArtifactExpander artifactExpander, @Nullable FileSystem actionFileSystem, @Nullable Object skyframeDepsResult) { @@ -125,7 +124,7 @@ public class ActionExecutionContext implements Closeable { metadataHandler, fileOutErr, clientEnv, - inputFilesetMappings, + topLevelFilesets, artifactExpander, /*env=*/ null, actionFileSystem, @@ -229,8 +228,8 @@ public class ActionExecutionContext implements Closeable { return executor.getEventHandler(); } - public ImmutableMap<PathFragment, ImmutableList<FilesetOutputSymlink>> getInputFilesetMappings() { - return inputFilesetMappings; + public ImmutableMap<PathFragment, ImmutableList<FilesetOutputSymlink>> getTopLevelFilesets() { + return topLevelFilesets; } @Nullable @@ -326,7 +325,7 @@ public class ActionExecutionContext implements Closeable { metadataHandler, fileOutErr, clientEnv, - inputFilesetMappings, + topLevelFilesets, artifactExpander, env, actionFileSystem, diff --git a/src/main/java/com/google/devtools/build/lib/actions/Artifact.java b/src/main/java/com/google/devtools/build/lib/actions/Artifact.java index 49dad3ff38..e48740b3a3 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/Artifact.java +++ b/src/main/java/com/google/devtools/build/lib/actions/Artifact.java @@ -161,6 +161,15 @@ public class Artifact * Only aggregating middlemen and tree artifacts are expanded. */ void expand(Artifact artifact, Collection<? super Artifact> output); + + /** + * Retrieve the expansion of Filesets for the given artifact. + * + * @param artifact {@code artifact.isFileset()} must be true. + */ + default ImmutableList<FilesetOutputSymlink> getFileset(Artifact artifact) { + throw new UnsupportedOperationException(); + } } public static final ImmutableList<Artifact> NO_ARTIFACTS = ImmutableList.of(); |