commit 52644cb29aee191b633cef0c34eceaa11b1d6ee6
author Treehugger Robot <treehugger-gerrit@google.com> Mon Aug 05 22:02:46 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 05 22:02:46 2019 +0000
tree 72f6f7184144acb41878ff36df5e367f12f797df
parent df7d2cc9f83e15f69ef1e8ccc08628517d223758
parent d06ecc8af1bd41440982faecc0517823df6298a9

Merge "Fix recovery-variant VNDK libs miss-installed to recovery img"

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index cc2e65f..54f21aa 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1898,7 +1898,7 @@
 			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