tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Install device_specific cc_prebuilt to ODM" am: dff81fa7d8 am: 7f0ceb9440

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1672246

Change-Id: I67953fb8fa139e05f2c2ed0dd66e70613395ecc7
This commit is contained in:
Treehugger Robot 2021-04-13 00:49:15 +00:00 committed by Automerger Merge Worker
commit 0e0bd37556
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cc/image.go
View file

@ -58,12 +58,14 @@ func (ctx *moduleContext) SocSpecific() bool {
// Additionally check if this module is inVendor() that means it is a "vendor" variant of a
// module. As well as SoC specific modules, vendor variants must be installed to /vendor
// unless they have "odm_available: true".
return ctx.ModuleContext.SocSpecific() || (ctx.mod.InVendor() && !ctx.mod.VendorVariantToOdm())
return ctx.ModuleContext.SocSpecific() ||
(ctx.mod.HasVendorVariant() && ctx.mod.InVendor() && !ctx.mod.VendorVariantToOdm())
}
func (ctx *moduleContext) DeviceSpecific() bool {
// Some vendor variants want to be installed to /odm by setting "odm_available: true".
return ctx.ModuleContext.DeviceSpecific() || (ctx.mod.InVendor() && ctx.mod.VendorVariantToOdm())
return ctx.ModuleContext.DeviceSpecific() ||
(ctx.mod.HasVendorVariant() && ctx.mod.InVendor() && ctx.mod.VendorVariantToOdm())
}
func (ctx *moduleContextImpl) inProduct() bool {