StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Dereference paths to be mounted into soong sandbox" am: 895d5bf924

Browse Source 
Change-Id: I608d02eca0c82c685ba225d9dbdcad92f66dcbf3
This commit is contained in:
Treehugger Robot
2020-04-16 07:18:25 +00:00
committed by Automerger Merge Worker
parent a898da2fcc 895d5bf924
commit 801151e560
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ui/build/sandbox_linux.go
View File

@@ -19,6 +19,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"os/user" "os/user"
"path/filepath"
"strings" "strings"
"sync" "sync"
) )
@@ -75,9 +76,20 @@ func (c *Cmd) sandboxSupported() bool {
sandboxConfig.group = "nobody" sandboxConfig.group = "nobody"
} }
// These directories will be bind mounted
// so we need full non-symlink paths
sandboxConfig.srcDir = absPath(c.ctx, ".") sandboxConfig.srcDir = absPath(c.ctx, ".")
if derefPath, err := filepath.EvalSymlinks(sandboxConfig.srcDir); err == nil {
sandboxConfig.srcDir = absPath(c.ctx, derefPath)
}
sandboxConfig.outDir = absPath(c.ctx, c.config.OutDir()) sandboxConfig.outDir = absPath(c.ctx, c.config.OutDir())
if derefPath, err := filepath.EvalSymlinks(sandboxConfig.outDir); err == nil {
sandboxConfig.outDir = absPath(c.ctx, derefPath)
}
sandboxConfig.distDir = absPath(c.ctx, c.config.DistDir()) sandboxConfig.distDir = absPath(c.ctx, c.config.DistDir())
if derefPath, err := filepath.EvalSymlinks(sandboxConfig.distDir); err == nil {
sandboxConfig.distDir = absPath(c.ctx, derefPath)
}
sandboxArgs := []string{ sandboxArgs := []string{
"-H", "android-build", "-H", "android-build",