From 543f60bc3199ef512caed1f540f17e0481ff11c9 Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Sun, 18 Oct 2020 10:54:31 +0900 Subject: [PATCH] Do not exclude VNDK modules from SoC/Product-specific modules The VNDK modules were excluded from SoC/Product specific modules because they were installed to system partition. However, as they moved to VNDK APEX, we don't need to make a exception for VNDK modules. Bug: 170711679 Test: Follow the steps below: $ lunch aosp_x86-eng $ m nothing # ctrl-C while running soong_build $ rm out/soong/.soong.in_make $ m --skip-make libc Change-Id: I001bc98e4031e5e8bcdea9cb920caa21b8744752 --- cc/image.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cc/image.go b/cc/image.go index ea6f5675c..6710e94b7 100644 --- a/cc/image.go +++ b/cc/image.go @@ -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 {