diff options
| author | 2020-09-10 09:24:17 +0000 | |
|---|---|---|
| committer | 2020-09-10 09:24:17 +0000 | |
| commit | 3e0b9c031caa7f004330d780d9d4631df3ee4bb3 (patch) | |
| tree | f8bbc43c0de87044b613ee5a1ccd2e9a75e0ec84 /java/app_builder.go | |
| parent | 4f35976c87c24f4584ff8f86298c63c75f063be4 (diff) | |
| parent | 16f23a4038d9156286a06ba757eaa9c1c86e562a (diff) | |
Merge "Check UseRBE is set before replacing any template with the RE version."
Diffstat (limited to 'java/app_builder.go')
| -rw-r--r-- | java/app_builder.go | 4 |
1 files changed, 2 insertions, 2 deletions
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(), ",") } |