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

Merge "Do not exclude VNDK modules from SoC/Product-specific modules"

Browse Source
This commit is contained in:
Treehugger Robot
2020-10-20 00:02:36 +00:00
committed by Gerrit Code Review
parent e72e1ff98b 543f60bc31
commit 1537692837
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cc/image.go
View File

@@ -63,12 +63,12 @@ const (
func (ctx *moduleContext) ProductSpecific() bool { func (ctx *moduleContext) ProductSpecific() bool {
return ctx.ModuleContext.ProductSpecific() || return ctx.ModuleContext.ProductSpecific() ||
(ctx.mod.HasVendorVariant() && ctx.mod.inProduct() && !ctx.mod.IsVndk()) (ctx.mod.HasVendorVariant() && ctx.mod.inProduct())
} }
func (ctx *moduleContext) SocSpecific() bool { func (ctx *moduleContext) SocSpecific() bool {
return ctx.ModuleContext.SocSpecific() || return ctx.ModuleContext.SocSpecific() ||
(ctx.mod.HasVendorVariant() && ctx.mod.inVendor() && !ctx.mod.IsVndk()) (ctx.mod.HasVendorVariant() && ctx.mod.inVendor())
} }
func (ctx *moduleContextImpl) inProduct() bool { func (ctx *moduleContextImpl) inProduct() bool {