diff --git a/ui/build/config.go b/ui/build/config.go index f80868c33..2e5921a2c 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -1349,6 +1349,19 @@ func (c *configImpl) rbeProxyLogsDir() string { 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()) return filepath.Join(buildTmpDir, "rbe") } diff --git a/ui/build/rbe.go b/ui/build/rbe.go index 3b9d301f5..19a54dfc2 100644 --- a/ui/build/rbe.go +++ b/ui/build/rbe.go @@ -55,13 +55,14 @@ func rbeCommand(ctx Context, config Config, rbeCmd string) string { func getRBEVars(ctx Context, config Config) map[string]string { vars := map[string]string{ - "RBE_log_dir": config.rbeProxyLogsDir(), - "RBE_re_proxy": config.rbeReproxy(), - "RBE_exec_root": config.rbeExecRoot(), - "RBE_output_dir": config.rbeProxyLogsDir(), - "RBE_proxy_log_dir": config.rbeProxyLogsDir(), - "RBE_cache_dir": config.rbeCacheDir(), - "RBE_platform": "container-image=" + remoteexec.DefaultImage, + "RBE_log_dir": config.rbeProxyLogsDir(), + "RBE_re_proxy": config.rbeReproxy(), + "RBE_exec_root": config.rbeExecRoot(), + "RBE_output_dir": config.rbeProxyLogsDir(), + "RBE_proxy_log_dir": config.rbeProxyLogsDir(), + "RBE_cache_dir": config.rbeCacheDir(), + "RBE_download_tmp_dir": config.rbeDownloadTmpDir(), + "RBE_platform": "container-image=" + remoteexec.DefaultImage, } if config.StartRBE() { name, err := config.rbeSockAddr(absPath(ctx, config.TempDir()))