commit a6d3667b670afd01d7e0c96df599ad5a1618f23b
author Jooyung Han <jooyung@google.com> Thu Feb 24 13:58:07 2022 +0900
committer Jooyung Han <jooyung@google.com> Thu Feb 24 13:59:45 2022 +0900
tree 4b02243ecb0d960a0f077fd3ce1d0d8e40198918
parent 315352e71c04e19a1350d7fcc0f7670743d1ec7b

apex supports ".apex" tag

Tests can embed non-compressed .apex output with the tag.

Bug: 221024307
Test: soong test
Change-Id: Id4a239d1897237105a064cea8c97029f5b996a98

apex/builder.go

diff --git a/apex/builder.go b/apex/builder.go
index fc4bf8a..183c215 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -810,6 +810,9 @@
 		Implicits:   implicits,
 		Args:        args,
 	})
+	if suffix == imageApexSuffix {
+		a.outputApexFile = signedOutputFile
+	}
 	a.outputFile = signedOutputFile
 
 	if ctx.ModuleDir() != "system/apex/apexd/apexd_testdata" && a.testOnlyShouldForceCompression() {