From 9ccbba0200cf56cc6b1b09bc45fa2efb1ea9a411 Mon Sep 17 00:00:00 2001 From: Vishwath Mohan Date: Mon, 28 May 2018 13:54:48 -0700 Subject: Disable CFI for vendor variants of all components The current VNDK ABI snapshot expects that CFI is disabled for components that either in the include paths (from cfi-common.mk) OR enabled directly in the makefile/blueprint. However, on non-arm64 architectures, the build system was only disabling CFI for vendor components in the include paths. This topic corrects it by (a) removing the include paths check to disable CFI for vendor variants (this CL), and (b) inheriting the CFI include paths in all product configs to ensure that when we update the ABI we're able to move to relying exclusively on (PRODUCT_)CFI_INCLUDE_PATHS. Bug: 66301104 Test: ABI matches for all architectures. Change-Id: I648edf13346b18fd88b623682e8590ed44709e0d --- cc/sanitize.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cc/sanitize.go b/cc/sanitize.go index 881a5a01..de970352 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -256,9 +256,8 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) { s.Diag.Cfi = nil } - // Also disable CFI for VNDK variants of components in the - // include paths - if ctx.isVndk() && ctx.useVndk() && ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) { + // Also disable CFI for VNDK variants of components + if ctx.isVndk() && ctx.useVndk() { s.Cfi = nil s.Diag.Cfi = nil } -- cgit v1.2.3