Check UseRBE is set before replacing any template with the RE version.

Test: presubmit
Change-Id: I6df58b4e700f0d231367af2710672d731d20a736
This commit is contained in:
Ramy Medhat
2020-09-03 01:29:49 -04:00
parent 4d947f0ea8
commit 16f23a4038
7 changed files with 15 additions and 15 deletions

View File

@@ -1464,7 +1464,7 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi
// Metalava uses lots of memory, restrict the number of metalava jobs that can run in parallel.
rule.HighMem()
cmd := rule.Command()
if ctx.Config().IsEnvTrue("RBE_METALAVA") {
if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_METALAVA") {
rule.Remoteable(android.RemoteRuleSupports{RBE: true})
pool := ctx.Config().GetenvWithDefault("RBE_METALAVA_POOL", "metalava")
execStrategy := ctx.Config().GetenvWithDefault("RBE_METALAVA_EXEC_STRATEGY", remoteexec.LocalExecStrategy)