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

Commit 0bfb9e8d authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Don't create native bridge variants of vendor modules"

parents 98be1bb0 83bead46

android/arch.go

+4 −1
Original line number Diff line number Diff line
@@ -824,7 +824,10 @@ func archMutator(mctx BottomUpMutatorContext) { 
	osTargets := mctx.Config().Targets[os]

	image := base.commonProperties.ImageVariation

	// Filter NativeBridge targets unless they are explicitly supported

	if os == Android && !Bool(base.commonProperties.Native_bridge_supported) {

	// Skip creating native bridge variants for vendor modules

	if os == Android &&

		!(Bool(base.commonProperties.Native_bridge_supported) && image == CoreVariation) {



		var targets []Target

		for _, t := range osTargets {

			if !t.NativeBridge {

cc/cc.go

+0 −3
Original line number Diff line number Diff line
@@ -2572,9 +2572,6 @@ func (m *Module) ImageMutatorBegin(mctx android.BaseModuleContext) { 
		// 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.