Don't symlink into the execroot if possible in SymlinkAction: instead, symlink directly to the target artifact. Also offer the option to not provide the package roots to create the execroot: we would like to avoid the execroot if possible.

PiperOrigin-RevId: 170515263

1 files changed, 5 insertions, 8 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeAnalysisResult.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeAnalysisResult.java
index 7db70f3e62..0314debba0 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeAnalysisResult.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeAnalysisResult.java
@@ -14,12 +14,9 @@
 package com.google.devtools.build.lib.skyframe;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
+import com.google.devtools.build.lib.actions.PackageRoots;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
-import com.google.devtools.build.lib.cmdline.PackageIdentifier;
-import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.skyframe.WalkableGraph;
-
 import java.util.Collection;
 
 /**
@@ -31,15 +28,15 @@ public class SkyframeAnalysisResult {
   private final ImmutableList<ConfiguredTarget> configuredTargets;
   private final WalkableGraph walkableGraph;
   private final ImmutableList<AspectValue> aspects;
-  private final ImmutableMap<PackageIdentifier, Path> packageRoots;
+  private final PackageRoots packageRoots;
 
-  public SkyframeAnalysisResult(
+  SkyframeAnalysisResult(
       boolean hasLoadingError,
       boolean hasAnalysisError,
       ImmutableList<ConfiguredTarget> configuredTargets,
       WalkableGraph walkableGraph,
       ImmutableList<AspectValue> aspects,
-      ImmutableMap<PackageIdentifier, Path> packageRoots) {
+      PackageRoots packageRoots) {
     this.hasLoadingError = hasLoadingError;
     this.hasAnalysisError = hasAnalysisError;
     this.configuredTargets = configuredTargets;
@@ -73,7 +70,7 @@ public class SkyframeAnalysisResult {
     return aspects;
   }
 
-  public ImmutableMap<PackageIdentifier, Path> getPackageRoots() {
+  public PackageRoots getPackageRoots() {
     return packageRoots;
   }
 }