|
@@ -1375,10 +1375,15 @@ 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.
|
|
|
- if !c.StubbyExists() && strings.Contains(authType, "use_google_prod_creds"){
|
|
|
+ if !c.StubbyExists() && strings.Contains(authType, "use_google_prod_creds") {
|
|
|
return false
|
|
|
}
|
|
|
if v, ok := c.Environment().Get("USE_RBE"); ok {
|