From 16f23a4038d9156286a06ba757eaa9c1c86e562a Mon Sep 17 00:00:00 2001 From: Ramy Medhat Date: Thu, 3 Sep 2020 01:29:49 -0400 Subject: Check UseRBE is set before replacing any template with the RE version. Test: presubmit Change-Id: I6df58b4e700f0d231367af2710672d731d20a736 --- java/java.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 4d7d568ad..d7faf9f25 100644 --- a/java/java.go +++ b/java/java.go @@ -1483,7 +1483,7 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { args := map[string]string{ "jarArgs": "-P META-INF/services/ " + strings.Join(proptools.NinjaAndShellEscapeList(zipargs), " "), } - if ctx.Config().IsEnvTrue("RBE_ZIP") { + if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_ZIP") { rule = zipRE args["implicits"] = strings.Join(services.Strings(), ",") } -- cgit v1.2.3-59-g8ed1b