commit 18b0844c49603b5d03bcc5db75e290c368656811
author Googler <noreply@google.com> Thu Oct 04 09:55:06 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Thu Oct 04 09:56:39 2018 -0700
tree ac4a05dbb79215cd08a6c8cc0664ff860725869a
parent 9b8b79002dc9e62bc3fa56525dc4b01c3c2fe805

Strip the execution root from target paths in FilesetOutputSymlink.

RELNOTES: None.
PiperOrigin-RevId: 215754628

src/main/java/com/google/devtools/build/lib/exec/FilesetManifest.java

diff --git a/src/main/java/com/google/devtools/build/lib/exec/FilesetManifest.java b/src/main/java/com/google/devtools/build/lib/exec/FilesetManifest.java
index 40e3842..220beec 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/FilesetManifest.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/FilesetManifest.java
@@ -16,6 +16,7 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.LineProcessor;
 import com.google.devtools.build.lib.actions.FileArtifactValue;
@@ -75,16 +76,17 @@
   public static FilesetManifest constructFilesetManifest(
       List<FilesetOutputSymlink> outputSymlinks,
       PathFragment targetPrefix,
-      RelativeSymlinkBehavior relSymlinkbehavior)
+      RelativeSymlinkBehavior relSymlinkBehavior,
+      PathFragment execRoot)
       throws IOException {
     LinkedHashMap<PathFragment, String> entries = new LinkedHashMap<>();
     Map<PathFragment, String> relativeLinks = new HashMap<>();
     Map<String, FileArtifactValue> artifactValues = new HashMap<>();
     for (FilesetOutputSymlink outputSymlink : outputSymlinks) {
       PathFragment fullLocation = targetPrefix.getRelative(outputSymlink.getName());
-      String artifact = outputSymlink.getTargetPath().getPathString();
-      artifact = artifact.isEmpty() ? null : artifact;
-      addSymlinkEntry(artifact, fullLocation, relSymlinkbehavior, entries, relativeLinks);
+      PathFragment linkTarget = outputSymlink.reconstituteTargetPath(execRoot);
+      String artifact = Strings.emptyToNull(linkTarget.getPathString());
+      addSymlinkEntry(artifact, fullLocation, relSymlinkBehavior, entries, relativeLinks);
       if (outputSymlink.getMetadata() instanceof FileArtifactValue) {
         artifactValues.put(artifact, (FileArtifactValue) outputSymlink.getMetadata());
       }