diff options
author | 2020-05-28 18:51:39 +0000 | |
---|---|---|
committer | 2020-05-28 18:51:39 +0000 | |
commit | f52d6420ea626b1b16feee6475c5a4fb0a57206c (patch) | |
tree | 1ab6ddeced8d78d5c7037a365159f3de667408be /apex/builder.go | |
parent | aa5f42c3c43c0e8ab2c2e1ff54bd0d040d2d5ee7 (diff) | |
parent | 8f37ec82d9384bfcaa243c0a75174c067e05ab35 (diff) |
Merge "Add support for remote-execution / caching of signapk actions" am: 8f37ec82d9
Change-Id: I35bc6a092e26924e8ef8b5e5c04da313bbca9146
Diffstat (limited to 'apex/builder.go')
-rw-r--r-- | apex/builder.go | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/apex/builder.go b/apex/builder.go index 11652bc67..a6a347b5f 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -582,19 +582,27 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { } a.outputFile = android.PathForModuleOut(ctx, a.Name()+suffix) + rule := java.Signapk + args := map[string]string{ + "certificates": a.container_certificate_file.String() + " " + a.container_private_key_file.String(), + "flags": "-a 4096", //alignment + } + implicits := android.Paths{ + a.container_certificate_file, + a.container_private_key_file, + } + if ctx.Config().IsEnvTrue("RBE_SIGNAPK") { + rule = java.SignapkRE + args["implicits"] = strings.Join(implicits.Strings(), ",") + args["outCommaList"] = a.outputFile.String() + } ctx.Build(pctx, android.BuildParams{ - Rule: java.Signapk, + Rule: rule, Description: "signapk", Output: a.outputFile, Input: unsignedOutputFile, - Implicits: []android.Path{ - a.container_certificate_file, - a.container_private_key_file, - }, - Args: map[string]string{ - "certificates": a.container_certificate_file.String() + " " + a.container_private_key_file.String(), - "flags": "-a 4096", //alignment - }, + Implicits: implicits, + Args: args, }) // Install to $OUT/soong/{target,host}/.../apex |