diff options
| author | 2020-09-03 01:29:49 -0400 | |
|---|---|---|
| committer | 2020-09-03 01:29:49 -0400 | |
| commit | 16f23a4038d9156286a06ba757eaa9c1c86e562a (patch) | |
| tree | ccca17aedf7f275b1fac669b8103c215987e500d /java/dex.go | |
| parent | 4d947f0ea84f80939348d1f792730b38ca5720c5 (diff) | |
Check UseRBE is set before replacing any template with the RE version.
Test: presubmit
Change-Id: I6df58b4e700f0d231367af2710672d731d20a736
Diffstat (limited to 'java/dex.go')
| -rw-r--r-- | java/dex.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/dex.go b/java/dex.go index c85914c41..15b4431db 100644 --- a/java/dex.go +++ b/java/dex.go @@ -288,7 +288,7 @@ func (d *dexer) compileDex(ctx android.ModuleContext, flags javaBuilderFlags, mi "outUsageZip": proguardUsageZip.String(), "outDir": outDir.String(), } - if ctx.Config().IsEnvTrue("RBE_R8") { + if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_R8") { rule = r8RE args["implicits"] = strings.Join(r8Deps.Strings(), ",") } @@ -304,7 +304,7 @@ func (d *dexer) compileDex(ctx android.ModuleContext, flags javaBuilderFlags, mi } else { d8Flags, d8Deps := d8Flags(flags) rule := d8 - if ctx.Config().IsEnvTrue("RBE_D8") { + if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_D8") { rule = d8RE } ctx.Build(pctx, android.BuildParams{ |