diff options
| author | 2020-05-28 19:06:40 +0000 | |
|---|---|---|
| committer | 2020-05-28 19:06:40 +0000 | |
| commit | 0f5e5c724e0f079097f4636b64a1ebcac26ce058 (patch) | |
| tree | 3fc4c31ac6ad2241dc8f5167e7e4837ca132ffd8 /apex/builder.go | |
| parent | 1de62786c32f50dbd0e4c8fe81b61c917234fd81 (diff) | |
| parent | f52d6420ea626b1b16feee6475c5a4fb0a57206c (diff) | |
Merge "Add support for remote-execution / caching of signapk actions" am: 8f37ec82d9 am: f52d6420ea
Change-Id: I3c51e0ff23903ba101d2029a632f99fc8342c2d9
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 30e48ddcd..1f1358a08 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 |