relativize symlink target wrt. execroot

bazelbuild · Dec 21, 2023 · a80c48a · a80c48a
1 parent b8bc95c
commit a80c48a
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionOutputMetadataStore.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionOutputMetadataStore.java
@@ -544,7 +544,15 @@ private FileArtifactValue constructFileArtifactValue(
         // target during previous action execution.
         path = statAndValue.realPath();
         injectedDigest = DigestUtils.manuallyComputeDigest(path, value.getSize());
-        return FileArtifactValue.createForResolvedSymlink(path.asFragment(), value, injectedDigest);
+
+        PathFragment execRootRelativeRealPath;
+        if (path.asFragment().startsWith(execRoot)) {
+          execRootRelativeRealPath = path.asFragment().relativeTo(execRoot);
+        } else {
+          execRootRelativeRealPath = path.asFragment();
+        }
+
+        return FileArtifactValue.createForResolvedSymlink(execRootRelativeRealPath, value, injectedDigest);
       }
 
       injectedDigest = DigestUtils.manuallyComputeDigest(path, value.getSize());