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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50c97d736e11fb830c6494899f304255f018f28c

apex/builder.go

@@ -786,6 +786,9 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
 		compressRule.Build("compressRule", "Generate unsigned compressed APEX file")
 
 		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{
 			Rule:        rule,
 			Description: "sign compressedApex",