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, 9 insertions, 17 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 7be226f7ff..44a79f9314 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,7 +63,8 @@ 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>> topLevelFilesets; + private final ImmutableMap<PathFragment, ImmutableList<FilesetOutputSymlink>> + inputFilesetMappings; @Nullable private final ArtifactExpander artifactExpander; @Nullable private final Environment env; @@ -82,7 +83,7 @@ public class ActionExecutionContext implements Closeable { MetadataHandler metadataHandler, FileOutErr fileOutErr, Map<String, String> clientEnv, - ImmutableMap<PathFragment, ImmutableList<FilesetOutputSymlink>> topLevelFilesets, + ImmutableMap<PathFragment, ImmutableList<FilesetOutputSymlink>> inputFilesetMappings, @Nullable ArtifactExpander artifactExpander, @Nullable SkyFunction.Environment env, @Nullable FileSystem actionFileSystem, @@ -93,7 +94,7 @@ public class ActionExecutionContext implements Closeable { this.metadataHandler = metadataHandler; this.fileOutErr = fileOutErr; this.clientEnv = ImmutableMap.copyOf(clientEnv); - this.topLevelFilesets = topLevelFilesets; + this.inputFilesetMappings = inputFilesetMappings; this.executor = executor; this.artifactExpander = artifactExpander; this.env = env; @@ -112,7 +113,7 @@ public class ActionExecutionContext implements Closeable { MetadataHandler metadataHandler, FileOutErr fileOutErr, Map<String, String> clientEnv, - ImmutableMap<PathFragment, ImmutableList<FilesetOutputSymlink>> topLevelFilesets, + ImmutableMap<PathFragment, ImmutableList<FilesetOutputSymlink>> inputFilesetMappings, ArtifactExpander artifactExpander, @Nullable FileSystem actionFileSystem, @Nullable Object skyframeDepsResult) { @@ -124,7 +125,7 @@ public class ActionExecutionContext implements Closeable { metadataHandler, fileOutErr, clientEnv, - topLevelFilesets, + inputFilesetMappings, artifactExpander, /*env=*/ null, actionFileSystem, @@ -228,8 +229,8 @@ public class ActionExecutionContext implements Closeable { return executor.getEventHandler(); } - public ImmutableMap<PathFragment, ImmutableList<FilesetOutputSymlink>> getTopLevelFilesets() { - return topLevelFilesets; + public ImmutableMap<PathFragment, ImmutableList<FilesetOutputSymlink>> getInputFilesetMappings() { + return inputFilesetMappings; } @Nullable @@ -325,7 +326,7 @@ public class ActionExecutionContext implements Closeable { metadataHandler, fileOutErr, clientEnv, - topLevelFilesets, + inputFilesetMappings, 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 e48740b3a3..49dad3ff38 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,15 +161,6 @@ 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(); |