diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java | 22 |
1 files changed, 5 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 44a79f9314..037f47b1ad 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 @@ -69,7 +69,6 @@ public class ActionExecutionContext implements Closeable { @Nullable private final Environment env; @Nullable private final FileSystem actionFileSystem; - @Nullable private final Object skyframeDepsResult; @Nullable private ImmutableList<FilesetOutputSymlink> outputSymlinks; @@ -86,8 +85,7 @@ public class ActionExecutionContext implements Closeable { ImmutableMap<PathFragment, ImmutableList<FilesetOutputSymlink>> inputFilesetMappings, @Nullable ArtifactExpander artifactExpander, @Nullable SkyFunction.Environment env, - @Nullable FileSystem actionFileSystem, - @Nullable Object skyframeDepsResult) { + @Nullable FileSystem actionFileSystem) { this.actionInputFileCache = actionInputFileCache; this.actionInputPrefetcher = actionInputPrefetcher; this.actionKeyContext = actionKeyContext; @@ -99,7 +97,6 @@ public class ActionExecutionContext implements Closeable { this.artifactExpander = artifactExpander; this.env = env; this.actionFileSystem = actionFileSystem; - this.skyframeDepsResult = skyframeDepsResult; this.pathResolver = ArtifactPathResolver.createPathResolver(actionFileSystem, // executor is only ever null in testing. executor == null ? null : executor.getExecRoot()); @@ -115,8 +112,7 @@ public class ActionExecutionContext implements Closeable { Map<String, String> clientEnv, ImmutableMap<PathFragment, ImmutableList<FilesetOutputSymlink>> inputFilesetMappings, ArtifactExpander artifactExpander, - @Nullable FileSystem actionFileSystem, - @Nullable Object skyframeDepsResult) { + @Nullable FileSystem actionFileSystem) { this( executor, actionInputFileCache, @@ -128,8 +124,7 @@ public class ActionExecutionContext implements Closeable { inputFilesetMappings, artifactExpander, /*env=*/ null, - actionFileSystem, - skyframeDepsResult); + actionFileSystem); } public static ActionExecutionContext forInputDiscovery( @@ -153,8 +148,7 @@ public class ActionExecutionContext implements Closeable { ImmutableMap.of(), /*artifactExpander=*/ null, env, - actionFileSystem, - /*skyframeDepsResult=*/ null); + actionFileSystem); } public ActionInputPrefetcher getActionInputPrefetcher() { @@ -284,11 +278,6 @@ public class ActionExecutionContext implements Closeable { return artifactExpander; } - @Nullable - public Object getSkyframeDepsResult() { - return skyframeDepsResult; - } - /** * Provide that {@code FileOutErr} that the action should use for redirecting the output and error * stream. @@ -329,7 +318,6 @@ public class ActionExecutionContext implements Closeable { inputFilesetMappings, artifactExpander, env, - actionFileSystem, - skyframeDepsResult); + actionFileSystem); } } |