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

Do not generate a random socket address for RBE if NOSTART_RBE is set.

Browse Source 
Test: A build with NOSTART_RBE=1
Change-Id: I5872632442c754b597901b7729eed597ee45859f
This commit is contained in:
Ramy Medhat
2020-08-13 22:53:42 -04:00
parent 29737cfc94
commit a958d35247
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/build/rbe.go
View File

@@ -53,12 +53,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 {
rand.Seed(time.Now().UnixNano()) rand.Seed(time.Now().UnixNano())
vars := map[string]string{ vars := map[string]string{
"RBE_server_address": fmt.Sprintf("unix://%v/reproxy_%v.sock", absPath(ctx, config.TempDir()), rand.Intn(1000)),
"RBE_log_path": config.rbeLogPath(), "RBE_log_path": config.rbeLogPath(),
"RBE_re_proxy": config.rbeReproxy(), "RBE_re_proxy": config.rbeReproxy(),
"RBE_exec_root": config.rbeExecRoot(), "RBE_exec_root": config.rbeExecRoot(),
"RBE_output_dir": config.rbeStatsOutputDir(), "RBE_output_dir": config.rbeStatsOutputDir(),
} }
if config.StartRBE() {
vars["RBE_server_address"] = fmt.Sprintf("unix://%v/reproxy_%v.sock", absPath(ctx, config.TempDir()), rand.Intn(1000))
}
k, v := config.rbeAuth() k, v := config.rbeAuth()
vars[k] = v vars[k] = v
return vars return vars