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" am: 1537692837 am: 4aeea16df3

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

Change-Id: I3f86e47262ae7330399425d1058fb7afcfb35bd0
This commit is contained in:
Treehugger Robot
2020-10-20 01:56:44 +00:00
committed by Automerger Merge Worker
parent c3a1b9e642 4aeea16df3
commit fffb427b3f
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 {