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

Merge "Fix RBE tmp dir" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-07-31 15:28:12 +00:00
committed by Gerrit Code Review
parent 6524e1d51c d4da266b35
commit 3cc8933133
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ui/build/config.go
View File

@@ -1341,8 +1341,7 @@ func (c *configImpl) rbeDownloadTmpDir() string {
} }
func (c *configImpl) rbeTmpDir() string { func (c *configImpl) rbeTmpDir() string {
buildTmpDir := shared.TempDirForOutDir(c.SoongOutDir()) return filepath.Join(c.SoongOutDir(), "rbe")
return filepath.Join(buildTmpDir, "rbe")
} }
func (c *configImpl) rbeCacheDir() string { func (c *configImpl) rbeCacheDir() string {

2
ui/build/rbe.go
View File

@@ -65,7 +65,7 @@ func getRBEVars(ctx Context, config Config) map[string]string {
"RBE_platform": "container-image=" + remoteexec.DefaultImage, "RBE_platform": "container-image=" + remoteexec.DefaultImage,
} }
if config.StartRBE() { if config.StartRBE() {
name, err := config.rbeSockAddr(absPath(ctx, config.TempDir())) name, err := config.rbeSockAddr(absPath(ctx, config.rbeTmpDir()))
if err != nil { if err != nil {
ctx.Fatalf("Error retrieving socket address: %v", err) ctx.Fatalf("Error retrieving socket address: %v", err)
return nil return nil