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

Merge "Install device_specific cc_prebuilt to ODM" am: dff81fa7d8

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

Change-Id: I5ac2dcea71b63fe73c3353ba15e6db2ef7077820
This commit is contained in:
Treehugger Robot
2021-04-13 00:28:01 +00:00
committed by Automerger Merge Worker
parent 8ac5437359 dff81fa7d8
commit 7f0ceb9440
1 changed files with 4 additions and 2 deletions
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 {