Short-circuit runfiles tree creation if runfiles are disabled (for example, on Windows by default)

--
MOS_MIGRATED_REVID=129319018

1 files changed, 4 insertions, 7 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeStrategy.java
index dc54714cd1..b79b9104bb 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeStrategy.java
@@ -23,8 +23,6 @@ import com.google.devtools.build.lib.analysis.SymlinkTreeAction;
 import com.google.devtools.build.lib.analysis.SymlinkTreeActionContext;
 import com.google.devtools.build.lib.analysis.config.BinTools;
 import com.google.devtools.build.lib.profiler.AutoProfiler;
-import com.google.devtools.build.lib.vfs.PathFragment;
-
 import java.util.logging.Logger;
 
 /**
@@ -47,7 +45,6 @@ public final class SymlinkTreeStrategy implements SymlinkTreeActionContext {
   public void createSymlinks(
       SymlinkTreeAction action,
       ActionExecutionContext actionExecutionContext,
-      PathFragment shExecutable,
       ImmutableMap<String, String> shellEnvironment,
       boolean enableRunfiles)
       throws ActionExecutionException, InterruptedException {
@@ -57,18 +54,18 @@ public final class SymlinkTreeStrategy implements SymlinkTreeActionContext {
                 "running " + action.prettyPrint(), LOG, /*minTimeForLoggingInMilliseconds=*/ 100)) {
       try {
         SymlinkTreeHelper helper = new SymlinkTreeHelper(
-            action.getInputManifest().getExecPath(),
-            action.getOutputManifest().getExecPath().getParentDirectory(), action.isFilesetTree());
+            action.getInputManifest().getPath(),
+            action.getOutputManifest().getPath().getParentDirectory(), action.isFilesetTree());
         if (outputService != null && outputService.canCreateSymlinkTree()) {
           outputService.createSymlinkTree(action.getInputManifest().getPath(),
               action.getOutputManifest().getPath(),
-              action.isFilesetTree(), helper.getSymlinkTreeRoot());
+              action.isFilesetTree(),
+              action.getOutputManifest().getExecPath().getParentDirectory());
         } else {
           helper.createSymlinks(
               action,
               actionExecutionContext,
               binTools,
-              shExecutable,
               shellEnvironment,
               enableRunfiles);
         }