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

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

Change-Id: Iba8218aeff3fb5520d26985f0899e2812028cccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-30 17:21:43 +00:00
committed by Automerger Merge Worker

View File

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