Merge "Don't use RBE for bp2build/queryview/api_bp2build/json_module_graph, even with USE_RBE=true." am: b54a3d08ac
am: 2ec2dbc3ec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643172 Change-Id: Ibab1acb0717ef58831dc8faa7dc01fde60b224d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1375,6 +1375,11 @@ func (c *configImpl) StartGoma() 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()
|
||||
// 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.
|
||||
|
Reference in New Issue
Block a user