[7.2.0] Fix writable sandbox path (#22451)

bazel-io · fmeum · web-flow · commit d31ce86fe8a4 · 2024-05-20T14:11:23.000Z
The reverts in 3fddc7f accidentally replaced `sandboxExecRoot` with `execRoot` in the function that computes writable directories for sandbox spawn runners. This issue was observed in MobileNativeFoundation/rules_xcodeproj#3029. Closes #22443. PiperOrigin-RevId: 635383877 Change-Id: I3d74bf78cf97ecd267ba90b68cf1b715850aba27 Commit b0ed4ca Co-authored-by: Fabian Meumertzheim <fabian@meumertzhe.im>
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/AbstractSandboxSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/AbstractSandboxSpawnRunner.java
@@ -372,7 +372,7 @@ protected ImmutableSet<Path> getWritableDirs(Path sandboxExecRoot, Map<String, S
     // On Windows, sandboxExecRoot is actually the main execroot. We will specify
     // exactly which output path is writable.
     if (OS.getCurrent() != OS.WINDOWS) {
-      writablePaths.add(execRoot);
+      writablePaths.add(sandboxExecRoot);
     }
 
     String testTmpdir = env.get("TEST_TMPDIR");

Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ protected ImmutableSet<Path> getWritableDirs(Path sandboxExecRoot, Map<String, S`
`372`	`372`	`// On Windows, sandboxExecRoot is actually the main execroot. We will specify`
`373`	`373`	`// exactly which output path is writable.`
`374`	`374`	`if (OS.getCurrent() != OS.WINDOWS) {`
`375`		`- writablePaths.add(execRoot);`
	`375`	`+ writablePaths.add(sandboxExecRoot);`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`String testTmpdir = env.get("TEST_TMPDIR");`