StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't use RBE for bp2build/queryview/api_bp2build/json_module_graph, even with USE_RBE=true." am: b54a3d08ac am: 2ec2dbc3ec am: 9eba82453d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643172

Change-Id: If1efb45745501cef1a329c6ec8c0d97cf2bde513
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-30 16:40:03 +00:00
committed by Automerger Merge Worker
parent 3329a4e764 9eba82453d
commit 5d36548f49
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ui/build/config.go
View File

@@ -1375,10 +1375,15 @@ func (c *configImpl) StartGoma() bool {
} }
func (c *configImpl) UseRBE() bool { func (c *configImpl) UseRBE() bool {
// These alternate modes of running Soong do not use RBE / reclient.
if c.Bp2Build() || c.Queryview() || c.ApiBp2build() || c.JsonModuleGraph() {
return false
}
authType, _ := c.rbeAuth() authType, _ := c.rbeAuth()
// Do not use RBE with prod credentials in scenarios when stubby doesn't exist, since // Do not use RBE with prod credentials in scenarios when stubby doesn't exist, since
// its unlikely that we will be able to obtain necessary creds without stubby. // its unlikely that we will be able to obtain necessary creds without stubby.
if !c.StubbyExists() && strings.Contains(authType, "use_google_prod_creds"){ if !c.StubbyExists() && strings.Contains(authType, "use_google_prod_creds") {
return false return false
} }
if v, ok := c.Environment().Get("USE_RBE"); ok { if v, ok := c.Environment().Get("USE_RBE"); ok {