diff options
| author |  Googler <noreply@google.com> | 2018-05-18 05:15:04 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-18 05:17:01 -0700 |
| commit | e854c86bde5af363e03b87dcf46e629dce694c17 (patch) | |
| tree | 2e7f8a16843c9b66dea9b3e5593069b7b2f06507 /src/main/java/com/google/devtools/build/lib/analysis | |
| parent | 8f71324e2a73e45f42909061a3919f7cdcb85eed (diff) | |
Changing SymlinkTreeStrategy not to use spawns.
RELNOTES: An internal action for symlinking runfiles will use Command instead of a Spawns. This should have no functional chages; the only user visible consequence should be that the internal action is no longer be included in statistics when calculating processes count.
PiperOrigin-RevId: 197131917
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java | 8 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeActionContext.java | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java index 87e2130b86..10a30d8d9f 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java @@ -102,9 +102,9 @@ public final class SymlinkTreeAction extends AbstractAction { @Override public ActionResult execute(ActionExecutionContext actionExecutionContext) throws ActionExecutionException, InterruptedException { - return ActionResult.create( - actionExecutionContext - .getContext(SymlinkTreeActionContext.class) - .createSymlinks(this, actionExecutionContext, shellEnvironment, enableRunfiles)); + actionExecutionContext + .getContext(SymlinkTreeActionContext.class) + .createSymlinks(this, actionExecutionContext, shellEnvironment, enableRunfiles); + return ActionResult.EMPTY; } } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeActionContext.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeActionContext.java index 449a0cc572..be6c9911cf 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeActionContext.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeActionContext.java @@ -17,8 +17,6 @@ import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.actions.ActionContext; import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.ActionExecutionException; -import com.google.devtools.build.lib.actions.SpawnResult; -import java.util.List; /** * Action context for symlink tree actions (an action that creates a tree of symlinks). @@ -30,7 +28,7 @@ public interface SymlinkTreeActionContext extends ActionContext { * * @return a list of SpawnResults created during symlink creation, if any */ - List<SpawnResult> createSymlinks( + void createSymlinks( SymlinkTreeAction action, ActionExecutionContext actionExecutionContext, ImmutableMap<String, String> shellEnvironment, |