Merge "Set default pool when RBE or goma is enabled"
diff --git a/ui/build/config.go b/ui/build/config.go
index 92aee4d..c8670ae 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -767,6 +767,10 @@
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()
diff --git a/ui/build/kati.go b/ui/build/kati.go
index a7799ea..307475a 100644
--- a/ui/build/kati.go
+++ b/ui/build/kati.go
@@ -89,6 +89,10 @@
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()
diff --git a/ui/build/ninja.go b/ui/build/ninja.go
index 66750d6..d5baafe 100644
--- a/ui/build/ninja.go
+++ b/ui/build/ninja.go
@@ -43,7 +43,7 @@
args = append(args, config.NinjaArgs()...)
var parallel int
- if config.UseGoma() || config.UseRBE() {
+ if config.UseRemoteBuild() {
parallel = config.RemoteParallel()
} else {
parallel = config.Parallel()