Pass ActionFS paths through to action-level FileOutErr for the Action's stdout/stderr.
RELNOTES: None
PiperOrigin-RevId: 200459354
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 2aff663..45ac667 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
@@ -84,7 +84,7 @@
this.artifactExpander = artifactExpander;
this.env = env;
this.actionFileSystem = actionFileSystem;
- this.pathResolver = createPathResolver(actionFileSystem,
+ this.pathResolver = ArtifactPathResolver.createPathResolver(actionFileSystem,
// executor is only ever null in testing.
executor == null ? null : executor.getExecRoot());
}
@@ -180,16 +180,6 @@
return pathResolver.transformRoot(artifact.getRoot().getRoot());
}
- private static ArtifactPathResolver createPathResolver(FileSystem actionFileSystem,
- Path execRoot) {
- if (actionFileSystem == null) {
- return ArtifactPathResolver.forExecRoot(execRoot);
- } else {
- return ArtifactPathResolver.withTransformedFileSystem(
- actionFileSystem.getPath(execRoot.asFragment()));
- }
- }
-
public ArtifactPathResolver getPathResolver() {
return pathResolver;
}