Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78d15f2b authored by Jingwen Chen's avatar Jingwen Chen Committed by Gerrit Code Review
Browse files

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

parents 62d33534 bad4182d

apex/apex.go

+1 −1
Original line number Diff line number Diff line
@@ -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) {