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 am: fffb427b3f

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

Change-Id: I449293c3b4eb8a43aecc48ba3567d84d3e76d79b
This commit is contained in:
Treehugger Robot
2020-10-20 02:27:51 +00:00
committed by Automerger Merge Worker
parent d2f3ece3f1 fffb427b3f
commit f1a496f0a5
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 {
return ctx.ModuleContext.ProductSpecific() ||
(ctx.mod.HasVendorVariant() && ctx.mod.inProduct() && !ctx.mod.IsVndk())
(ctx.mod.HasVendorVariant() && ctx.mod.inProduct())
}
func (ctx *moduleContext) SocSpecific() bool {
return ctx.ModuleContext.SocSpecific() ||
(ctx.mod.HasVendorVariant() && ctx.mod.inVendor() && !ctx.mod.IsVndk())
(ctx.mod.HasVendorVariant() && ctx.mod.inVendor())
}
func (ctx *moduleContextImpl) inProduct() bool {