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

Merge "Set download_tmp_dir explicitly to be a directory under the output directory." into main am: 67b4973126

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2781987

Change-Id: Ib7c036acd04cbef3684818ae2b00b1af0a17e861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ramy Medhat
2023-10-12 01:43:57 +00:00
committed by Automerger Merge Worker
parent 029d1673d7 67b4973126
commit c0aa94c17a
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ui/build/config.go
View File

@@ -1349,6 +1349,19 @@ func (c *configImpl) rbeProxyLogsDir() string {
return v return v
} }
} }
return c.rbeTmpDir()
}
func (c *configImpl) rbeDownloadTmpDir() string {
for _, f := range []string{"RBE_download_tmp_dir", "FLAG_download_tmp_dir"} {
if v, ok := c.environ.Get(f); ok {
return v
}
}
return c.rbeTmpDir()
}
func (c *configImpl) rbeTmpDir() string {
buildTmpDir := shared.TempDirForOutDir(c.SoongOutDir()) buildTmpDir := shared.TempDirForOutDir(c.SoongOutDir())
return filepath.Join(buildTmpDir, "rbe") return filepath.Join(buildTmpDir, "rbe")
} }

15
ui/build/rbe.go
View File

@@ -55,13 +55,14 @@ func rbeCommand(ctx Context, config Config, rbeCmd string) string {
func getRBEVars(ctx Context, config Config) map[string]string { func getRBEVars(ctx Context, config Config) map[string]string {
vars := map[string]string{ vars := map[string]string{
"RBE_log_dir": config.rbeProxyLogsDir(), "RBE_log_dir": config.rbeProxyLogsDir(),
"RBE_re_proxy": config.rbeReproxy(), "RBE_re_proxy": config.rbeReproxy(),
"RBE_exec_root": config.rbeExecRoot(), "RBE_exec_root": config.rbeExecRoot(),
"RBE_output_dir": config.rbeProxyLogsDir(), "RBE_output_dir": config.rbeProxyLogsDir(),
"RBE_proxy_log_dir": config.rbeProxyLogsDir(), "RBE_proxy_log_dir": config.rbeProxyLogsDir(),
"RBE_cache_dir": config.rbeCacheDir(), "RBE_cache_dir": config.rbeCacheDir(),
"RBE_platform": "container-image=" + remoteexec.DefaultImage, "RBE_download_tmp_dir": config.rbeDownloadTmpDir(),
"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.TempDir()))