Merge "Relax restriction on suffix of apex_set filename to include .capex" am: 385cde82d4

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1821656 Change-Id: I91189bd060d0c365892234daab5a59b70a8018c7
2021-09-09 09:08:51 +00:00
parent c08fff0423 385cde82d4
commit 17544fe23a
5 changed files with 38 additions and 8 deletions
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1141,9 +1141,10 @@ const (

 const (
 	// File extensions of an APEX for different packaging methods
-	imageApexSuffix = ".apex"
-	zipApexSuffix   = ".zipapex"
-	flattenedSuffix = ".flattened"
+	imageApexSuffix  = ".apex"
+	imageCapexSuffix = ".capex"
+	zipApexSuffix    = ".zipapex"
+	flattenedSuffix  = ".flattened"

 	// variant names each of which is for a packaging method
 	imageApexType     = "image"