StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix recovery-variant VNDK libs miss-installed to recovery img" am: 52644cb29a am: 263802ebda am: 371955973a

Browse Source 
am: cd40569204

Change-Id: I181e68554baba9f4c6e3953b6a219c20a76ea0a7
This commit is contained in:
yidong.zhang
2019-08-05 15:40:51 -07:00
committed by android-build-merger
parent 5759698e6d cd40569204
commit 8bdc4102ef
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/cc.go
View File

@@ -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