StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix capex build rule when building using RBE" am: 43c2fe1620 am: 68a9c0aff2

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1554058

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1af9b8c52eb2203e4b17408550b1148269926b2
This commit is contained in:
Mohammad Islam
2021-01-20 15:31:49 +00:00
committed by Automerger Merge Worker
parent dee5011892 68a9c0aff2
commit 3523ffa793
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apex/builder.go
View File

@@ -786,6 +786,9 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
compressRule.Build("compressRule", "Generate unsigned compressed APEX file") compressRule.Build("compressRule", "Generate unsigned compressed APEX file")
signedCompressedOutputFile := android.PathForModuleOut(ctx, a.Name()+".capex") signedCompressedOutputFile := android.PathForModuleOut(ctx, a.Name()+".capex")
if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_SIGNAPK") {
args["outCommaList"] = signedCompressedOutputFile.String()
}
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: rule, Rule: rule,
Description: "sign compressedApex", Description: "sign compressedApex",