commit 9c993544650a3b60e3d4f819aa800f2737a36db2
author Elvis Chien <elvis.chien@mediatek.com> Fri Jun 25 01:15:17 2021 +0800
committer mediatek <elvis.chien@mediatek.com> Wed Aug 04 18:07:51 2021 +0800
tree 022593d4ec4abedae0722f37fba742a5a3851eb0
parent bf49705608a09c68a243de03dceefb4bff2c343f

Allow PRODUCT_CFI_INCLUDE_PATHS to work with blueprints also

but disable it for host modules like how it's done for Android.mk

Bug:
179233410

Test:
m -j32

Change-Id: I246cd9163e06997a2b50cd25688370690c8929af

cc/library.go

diff --git a/cc/library.go b/cc/library.go
index 8f302fc..6c7102e 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -1751,7 +1751,7 @@
 					mayUseCoreVariant = false
 				}
 
-				if ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) && ctx.Arch().ArchType == android.Arm64 {
+				if ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) {
 					mayUseCoreVariant = false
 				}