Revert "Clean environment variables to account for sandbox work directory."
This reverts commit 0af8ea14fc950d1121260dc6c02fa9a5b0ceb77d.
Reason for revert: <Droidmonitor created revert due to b/363848580. Will be verifying through ABTD before submission.>
Change-Id: Iafba28897ad27df67ef8ae8904454196c482216d
diff --git a/ui/build/sandbox_linux.go b/ui/build/sandbox_linux.go
index 6c46000..d9ca854 100644
--- a/ui/build/sandbox_linux.go
+++ b/ui/build/sandbox_linux.go
@@ -187,17 +187,8 @@
return args
}
-func (c *Cmd) workDir() string {
- if !c.config.UseABFS() {
- wd, _ := os.Getwd()
- return wd
- }
-
- return abfsSrcDir
-}
-
func (c *Cmd) wrapSandbox() {
- wd := c.workDir()
+ wd, _ := os.Getwd()
var sandboxArgs []string
sandboxArgs = append(sandboxArgs,
@@ -235,7 +226,7 @@
)
sandboxArgs = append(sandboxArgs,
- c.readMountArgs()...,
+ c.readMountArgs()...
)
sandboxArgs = append(sandboxArgs,