summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
authorRamy Medhat <abdelaal@google.com>2020-09-03 01:29:49 -0400
committerRamy Medhat <abdelaal@google.com>2020-09-03 01:29:49 -0400
commit16f23a4038d9156286a06ba757eaa9c1c86e562a (patch)
treeccca17aedf7f275b1fac669b8103c215987e500d /java/java.go
parent4d947f0ea84f80939348d1f792730b38ca5720c5 (diff)
Check UseRBE is set before replacing any template with the RE version.
Test: presubmit Change-Id: I6df58b4e700f0d231367af2710672d731d20a736
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go2
1 files changed, 1 insertions, 1 deletions
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(), ",")
}