diff options
author | felly <felly@google.com> | 2018-05-24 15:03:40 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-05-24 15:05:12 -0700 |
commit | 7fd3b003ac45413b5808e589ab4770a511b6e34c (patch) | |
tree | 49c00c5e0d942b8709b530b5fac2a663b1cd761f /src/main/java/com/google/devtools/build | |
parent | cdf5a072c3b876f27bcbcd2cb1f0d216b24b1ec0 (diff) |
When in use, always return ActionFS paths from the ActionExecutionContext. Instead,defer to ActionFS regarding the choice about delegation to top-level Filesystem.
RELNOTES: None
PiperOrigin-RevId: 197960416
Diffstat (limited to 'src/main/java/com/google/devtools/build')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java | 9 |
1 files changed, 7 insertions, 2 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 eae8b9c58a..b1bd6f6eca 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 @@ -146,11 +146,16 @@ public class ActionExecutionContext implements Closeable { } public FileSystem getFileSystem() { + if (actionFileSystem != null) { + return actionFileSystem; + } return executor.getFileSystem(); } public Path getExecRoot() { - return executor.getExecRoot(); + return actionFileSystem != null + ? actionFileSystem.getPath(executor.getExecRoot().asFragment()) + : executor.getExecRoot(); } /** @@ -170,7 +175,7 @@ public class ActionExecutionContext implements Closeable { } return artifact.getPath(); } - return executor.getExecRoot().getRelative(input.getExecPath()); + return getExecRoot().getRelative(input.getExecPath()); } public Root getRoot(Artifact artifact) { |