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

This commit is contained in:
Jingwen Chen
2023-03-23 07:06:45 +00:00
committed by Gerrit Code Review

View File

@@ -1942,7 +1942,7 @@ func (f fsType) string() string {
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) {