Merge "Mixed builds is supported for all apex module types, not just "apex"."
This commit is contained in:
@@ -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) {
|
||||
|
Reference in New Issue
Block a user