diff options
| author | 2020-09-10 09:50:35 +0000 | |
|---|---|---|
| committer | 2020-09-10 09:50:35 +0000 | |
| commit | f15ed4fe6116a60a9518a8c8ca193da1b4439d62 (patch) | |
| tree | 08e8253ba0fb101b1804c0387c3c8535a9a769ce /java/app_builder.go | |
| parent | 410b20dba204f74acb994d587d6fb8af7253d8d1 (diff) | |
| parent | 3e0b9c031caa7f004330d780d9d4631df3ee4bb3 (diff) | |
Merge "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1419252
Change-Id: I52b7a3810fdf3314ae107f4b8330e9d6f62c6302
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 97ec269ee..69e462c3d 100644 --- a/java/app_builder.go +++ b/java/app_builder.go @@ -102,7 +102,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(), ",") @@ -241,7 +241,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(), ",") } |