diff options
Diffstat (limited to 'java/app_builder.go')
| -rw-r--r-- | java/app_builder.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/app_builder.go b/java/app_builder.go index 97ec269ee..4a18dcada 100644 --- a/java/app_builder.go +++ b/java/app_builder.go @@ -30,9 +30,9 @@ import ( ) var ( - Signapk, SignapkRE = remoteexec.StaticRules(pctx, "signapk", + Signapk, SignapkRE = pctx.RemoteStaticRules("signapk", blueprint.RuleParams{ - Command: `$reTemplate${config.JavaCmd} ${config.JavaVmFlags} -Djava.library.path=$$(dirname ${config.SignapkJniLibrary}) ` + + Command: `rm -f $out && $reTemplate${config.JavaCmd} ${config.JavaVmFlags} -Djava.library.path=$$(dirname ${config.SignapkJniLibrary}) ` + `-jar ${config.SignapkCmd} $flags $certificates $in $out`, CommandDeps: []string{"${config.SignapkCmd}", "${config.SignapkJniLibrary}"}, }, @@ -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(), ",") } |