From 9ac0e329796ab6ed42162b228c61d4d0b3f728d6 Mon Sep 17 00:00:00 2001
From: Mohammad Samiul Islam <samiul@google.com>
Date: Tue, 19 Jan 2021 11:32:29 +0000
Subject: [PATCH] Fix capex build rule when building using RBE

Presubmit builds were failing cause they were being built using RBE.

Bug: 172911362
Test: presubmit-builds are passing now
Change-Id: I65ffd912ccf2f4fb8cb9824e7a9579f66908d7b3
---
 apex/builder.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apex/builder.go b/apex/builder.go
index bc1b56600..e6bc3bdb4 100644
--- a/apex/builder.go
+++ b/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",