From 7589c82eecd4c25279f64464609708ff8400dcb0 Mon Sep 17 00:00:00 2001 From: Vishwath Mohan Date: Wed, 23 May 2018 19:29:55 -0700 Subject: [PATCH] Disable CFI for vendor variants of VNDK libraries Enabling CFI changes the VNDK ABI from the frozen snapshot, so the only solution for now is to temporarily disable CFI on all vendor variants for the sake of compatibility. Bug: 66301104 Test: ABI is consistent. Change-Id: Ie7dca41e0f647808b08adede09a30f3c746e6bda --- cc/sanitize.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cc/sanitize.go b/cc/sanitize.go index fc44eaf18..205b2a205 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -256,6 +256,13 @@ 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()) { + s.Cfi = nil + s.Diag.Cfi = nil + } + if ctx.staticBinary() { s.Address = nil s.Coverage = nil