From d06ecc8af1bd41440982faecc0517823df6298a9 Mon Sep 17 00:00:00 2001 From: "yidong.zhang" Date: Fri, 2 Aug 2019 15:49:24 +0800 Subject: [PATCH] Fix recovery-variant VNDK libs miss-installed to recovery img When no-vendor-variant VNDK is enabled,the vendor variant of VNDK libraries are not installed.This should not be fit for recovery module. Recovery module deps should be always installed. Bug: 138812833 Test: `adb reboot recovery;` recovery mode boot ok Change-Id: I0c3b8ac0fb0176677ddd94ba7216dd068f2eb81b --- cc/cc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cc/cc.go b/cc/cc.go index cc2e65faf..54f21aa30 100644 --- a/cc/cc.go +++ b/cc/cc.go @@ -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