diff options
author | 2018-03-15 14:18:46 -0700 | |
---|---|---|
committer | 2018-03-15 14:20:29 -0700 | |
commit | 18726b7e62ab40fa7d1531af7f72fca17abcdb0a (patch) | |
tree | 5da2d9407b172bfefc58202ca6901bc54040490b /src/main/java/com/google/devtools/build/lib/analysis | |
parent | 31032f5a089ded7ebeeb2786eb91864ac58e3306 (diff) |
Begins cleanup to allow ActionFS to be injected into all action executions.
PiperOrigin-RevId: 189244665
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis')
5 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/ExecutableSymlinkAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/ExecutableSymlinkAction.java index 1be6ad2ea1..18f79aee64 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/ExecutableSymlinkAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/ExecutableSymlinkAction.java @@ -39,7 +39,7 @@ public final class ExecutableSymlinkAction extends SymlinkAction { @Override public ActionResult execute(ActionExecutionContext actionExecutionContext) throws ActionExecutionException { - Path inputPath = getPrimaryInput().getPath(); + Path inputPath = actionExecutionContext.getInputPath(getPrimaryInput()); try { // Validate that input path is a file with the executable bit is set. if (!inputPath.isFile()) { diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/LauncherFileWriteAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/LauncherFileWriteAction.java index 5ad73764c1..fe880c65fa 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/LauncherFileWriteAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/LauncherFileWriteAction.java @@ -75,7 +75,7 @@ public final class LauncherFileWriteAction extends AbstractFileWriteAction { // single-machine execution environment, but problematic with remote execution. Preconditions.checkState(OS.getCurrent() == OS.WINDOWS); return out -> { - InputStream in = this.launcher.getPath().getInputStream(); + InputStream in = ctx.getInputPath(this.launcher).getInputStream(); ByteStreams.copy(in, out); long dataLength = this.launchInfo.write(out); ByteBuffer buffer = ByteBuffer.allocate(Long.BYTES); diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/PopulateTreeArtifactAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/PopulateTreeArtifactAction.java index 131830a41e..ae6d210ffd 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/PopulateTreeArtifactAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/PopulateTreeArtifactAction.java @@ -185,7 +185,7 @@ public final class PopulateTreeArtifactAction extends AbstractAction { try { for (ActionInput fileEntry : spawn.getOutputFiles()) { FileSystemUtils.createDirectoryAndParents( - ((Artifact) fileEntry).getPath().getParentDirectory()); + actionExecutionContext.getInputPath(((Artifact) fileEntry)).getParentDirectory()); } } catch (IOException e) { throw new ActionExecutionException(e, this, false); diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkAction.java index 13b7aaaead..ed68eb5f0e 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkAction.java @@ -115,7 +115,7 @@ public class SymlinkAction extends AbstractAction { throws ActionExecutionException { Path srcPath; if (inputPath == null) { - srcPath = getPrimaryInput().getPath(); + srcPath = actionExecutionContext.getInputPath(getPrimaryInput()); } else { srcPath = actionExecutionContext.getExecRoot().getRelative(inputPath); } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraAction.java b/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraAction.java index 1b084ba69d..7248874cdd 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraAction.java @@ -165,7 +165,7 @@ public final class ExtraAction extends SpawnAction { if (createDummyOutput) { for (Artifact output : getOutputs()) { try { - FileSystemUtils.touchFile(output.getPath()); + FileSystemUtils.touchFile(actionExecutionContext.getInputPath(output)); } catch (IOException e) { throw new ActionExecutionException(e.getMessage(), e, this, false); } |