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

Commit 37195597 authored by yidong.zhang's avatar yidong.zhang Committed by android-build-merger
Browse files

Merge "Fix recovery-variant VNDK libs miss-installed to recovery img" am: 52644cb2 

am: 263802eb

Change-Id: I05793d99bc132012cbd74aebdb695b3f6d108ccf
parents 35cabd5d 263802eb

cc/cc.go

+1 −1
Original line number Diff line number Diff line
@@ -1898,7 +1898,7 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps { 
			isVendorPublicLib := inList(libName, *vendorPublicLibraries)

			bothVendorAndCoreVariantsExist := ccDep.hasVendorVariant() || isLLndk



			if ctx.DeviceConfig().VndkUseCoreVariant() && ccDep.isVndk() && !ccDep.mustUseVendorVariant() {

			if ctx.DeviceConfig().VndkUseCoreVariant() && ccDep.isVndk() && !ccDep.mustUseVendorVariant() && !c.inRecovery() {

				// The vendor module is a no-vendor-variant VNDK library.  Depend on the

				// core module instead.

				return libName