tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Do not generate a random socket address for RBE if NOSTART_RBE is set." am: 39fff45b8e

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

Change-Id: I904976d45110a6857d8171e0f19772233fd28b56
This commit is contained in:
Ramy Medhat 2020-08-14 18:29:37 +00:00 committed by Automerger Merge Worker
commit 30a09c0b81
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ui/build/rbe.go
View file

@ -53,11 +53,13 @@ func rbeCommand(ctx Context, config Config, rbeCmd string) string {
func getRBEVars(ctx Context, config Config) map[string]string {
rand.Seed(time.Now().UnixNano())
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_re_proxy": config.rbeReproxy(),
"RBE_exec_root": config.rbeExecRoot(),
"RBE_output_dir": config.rbeStatsOutputDir(),
"RBE_log_path": config.rbeLogPath(),
"RBE_re_proxy": config.rbeReproxy(),
"RBE_exec_root": config.rbeExecRoot(),
"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()
vars[k] = v