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

2020-09-10 09:24:17 +00:00
parent 4f35976c87 16f23a4038
commit 3e0b9c031c
7 changed files with 15 additions and 15 deletions
--- a/java/java.go
+++ b/java/java.go
@@ -1490,7 +1490,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(), ",")
 		}