commit 78d15f2b74c3dc52994b960e033c36a94a9ab2eb
author Jingwen Chen <jingwen@google.com> Thu Mar 23 07:06:45 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 23 07:06:45 2023 +0000
tree d15dc20ce0a9f4b09713a963b908630a3e170d3a
parent 62d33534341288cba26889363842b4a0d03bb503
parent bad4182ddc189407ffc7ca45907c18b7e8497b0b

Merge "Mixed builds is supported for all apex module types, not just "apex"."

apex/apex.go

diff --git a/apex/apex.go b/apex/apex.go
index ac81885..957c94b 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1942,7 +1942,7 @@
 var _ android.MixedBuildBuildable = (*apexBundle)(nil)
 
 func (a *apexBundle) IsMixedBuildSupported(ctx android.BaseModuleContext) bool {
-	return ctx.ModuleType() == "apex" && a.properties.ApexType == imageApex
+	return a.properties.ApexType == imageApex
 }
 
 func (a *apexBundle) QueueBazelCall(ctx android.BaseModuleContext) {