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

ui/build/config.go

@@ -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

@@ -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

@@ -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()