Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbe9aa2c authored by Ramy Medhat's avatar Ramy Medhat Committed by Patrice Arruda
Browse files

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

Test: A build with NOSTART_RBE=1
Bug: b/166273085
Change-Id: I5872632442c754b597901b7729eed597ee45859f
Merged-In: I5872632442c754b597901b7729eed597ee45859f
parent ee17f8c0

ui/build/rbe.go

+7 −5
Original line number Diff line number Diff line
@@ -53,12 +53,14 @@ 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(),

	}

	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

	return vars