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/app_builder.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/app_builder.go') diff --git a/java/app_builder.go b/java/app_builder.go index 014bd54f1..2a08e04c8 100644 --- a/java/app_builder.go +++ b/java/app_builder.go @@ -97,7 +97,7 @@ func SignAppPackage(ctx android.ModuleContext, signedApk android.WritablePath, u "certificates": strings.Join(certificateArgs, " "), "flags": strings.Join(flags, " "), } - if ctx.Config().IsEnvTrue("RBE_SIGNAPK") { + if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_SIGNAPK") { rule = SignapkRE args["implicits"] = strings.Join(deps.Strings(), ",") args["outCommaList"] = strings.Join(outputFiles.Strings(), ",") @@ -236,7 +236,7 @@ func TransformJniLibsToJar(ctx android.ModuleContext, outputFile android.Writabl args := map[string]string{ "jarArgs": strings.Join(proptools.NinjaAndShellEscapeList(jarArgs), " "), } - if ctx.Config().IsEnvTrue("RBE_ZIP") { + if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_ZIP") { rule = zipRE args["implicits"] = strings.Join(deps.Strings(), ",") } -- cgit v1.2.3-59-g8ed1b