openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[DO NOT MERGE] Do not generate a random socket address for RBE if NOSTART_RBE is set. am: 00ff4cc1ef 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12595316

Change-Id: I998695e40231538fdcaf485ba2e2dccad0480606
This commit is contained in:
Ramy Medhat 2020-09-16 19:17:33 +00:00 committed by Automerger Merge Worker
parent 6f14c848ca 00ff4cc1ef
commit 989f2d167f
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