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

Commit 409e833d authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Set default pool when RBE or goma is enabled"

parents 0f568b12 9016b912

ui/build/config.go

+4 −0
Original line number Diff line number Diff line
@@ -767,6 +767,10 @@ func (c *configImpl) StartRBE() bool { 
	return true

}



func (c *configImpl) UseRemoteBuild() bool {

	return c.UseGoma() || c.UseRBE()

}



// RemoteParallel controls how many remote jobs (i.e., commands which contain

// gomacc) are run in parallel.  Note the parallelism of all other jobs is

// still limited by Parallel()

ui/build/kati.go

+4 −0
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@ func runKati(ctx Context, config Config, extraSuffix string, args []string, envF 
		args = append(args, "--empty_ninja_file")

	}



	if config.UseRemoteBuild() {

		args = append(args, "--default_pool=local_pool")

	}



	cmd := Command(ctx, config, "ckati", executable, args...)

	cmd.Sandbox = katiSandbox

	pipe, err := cmd.StdoutPipe()

ui/build/ninja.go

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ func runNinja(ctx Context, config Config) { 
	args = append(args, config.NinjaArgs()...)



	var parallel int

	if config.UseGoma() || config.UseRBE() {

	if config.UseRemoteBuild() {

		parallel = config.RemoteParallel()

	} else {

		parallel = config.Parallel()