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

This includes apex_test and apex_vndk. Rely on mixed builds module
allowlist to filter further.

Test: presubmits
Test: m test_com.android.adbd; showcommands test_com.android.adbd | tail -n1 | grep bazel-out
Change-Id: Id73db0917ad4a6dd9c0646d5186753ed940e735f

parent 1cb8b5b5

apex/apex.go

+1 −1

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