commit 16f23a4038d9156286a06ba757eaa9c1c86e562a
author Ramy Medhat <abdelaal@google.com> Thu Sep 03 01:29:49 2020 -0400
committer Ramy Medhat <abdelaal@google.com> Thu Sep 03 01:29:49 2020 -0400
tree ccca17aedf7f275b1fac669b8103c215987e500d
parent 4d947f0ea84f80939348d1f792730b38ca5720c5

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

Test: presubmit
Change-Id: I6df58b4e700f0d231367af2710672d731d20a736

apex/builder.go

diff --git a/apex/builder.go b/apex/builder.go
index 0a1ec3e..27de00e 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -648,7 +648,7 @@
 		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()