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

Commit 989f2d16 authored by Ramy Medhat's avatar Ramy Medhat Committed by Automerger Merge Worker
Browse files

[DO NOT MERGE] Do not generate a random socket address for RBE if NOSTART_RBE... 

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

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

Change-Id: I998695e40231538fdcaf485ba2e2dccad0480606
parents 6f14c848 00ff4cc1

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