From 16f23a4038d9156286a06ba757eaa9c1c86e562a Mon Sep 17 00:00:00 2001
From: Ramy Medhat <abdelaal@google.com>
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
---
 apex/builder.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'apex/builder.go')

diff --git a/apex/builder.go b/apex/builder.go
index 0a1ec3eb3..27de00e5c 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -648,7 +648,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
 		a.container_certificate_file,
 		a.container_private_key_file,
 	}
-	if ctx.Config().IsEnvTrue("RBE_SIGNAPK") {
+	if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_SIGNAPK") {
 		rule = java.SignapkRE
 		args["implicits"] = strings.Join(implicits.Strings(), ",")
 		args["outCommaList"] = a.outputFile.String()
-- 
cgit v1.2.3-59-g8ed1b