Skip creating vendor variants for native_bridge modules am: 1282f42ed6 am: b4ce961486

am: e24b072028

Change-Id: I4ba2c0f2812f7387383b5c63aa91a55e0f3c6424

cc/cc.go

@@ -2323,6 +2323,9 @@ func ImageMutator(mctx android.BottomUpMutatorContext) {
 		// If the device isn't compiling against the VNDK, we always
 		// use the core mode.
 		coreVariantNeeded = true
+	} else if m.Target().NativeBridge == android.NativeBridgeEnabled {
+		// Skip creating vendor variants for natvie bridge modules
+		coreVariantNeeded = true
 	} else if _, ok := m.linker.(*llndkStubDecorator); ok {
 		// LL-NDK stubs only exist in the vendor variant, since the
 		// real libraries will be used in the core variant.