commit dd0418a4d4790252b1b1c13eedbebbf09bd4d76e
author Ramy Medhat <abdelaal@google.com> Mon Nov 04 18:16:11 2019 -0500
committer Colin Cross <ccross@android.com> Tue Nov 05 22:57:35 2019 +0000
tree 20ae046dba7186caf10e51ec29dfa96e25220de2
parent 1f056cd69d5d6e5e720a028fea345e09e3508ffe

Run non-RBE supported actions in the local pool when USE_RBE is set.

Bug: 143938974
Test: ran CTS build at -j500 successfully.
Change-Id: I55074bd67308cd716972e24fb56a20bc393d5d9d

bpf/bpf.go

diff --git a/bpf/bpf.go b/bpf/bpf.go
index 90ec963..024fcbc 100644
--- a/bpf/bpf.go
+++ b/bpf/bpf.go
@@ -33,7 +33,7 @@
 var (
 	pctx = android.NewPackageContext("android/soong/bpf")
 
-	ccRule = pctx.AndroidGomaStaticRule("ccRule",
+	ccRule = pctx.AndroidRemoteStaticRule("ccRule", android.SUPPORTS_GOMA,
 		blueprint.RuleParams{
 			Depfile:     "${out}.d",
 			Deps:        blueprint.DepsGCC,