Merge "Allow PRODUCT_CFI_INCLUDE_PATHS to work with blueprints also"

2021-08-18 15:18:41 +00:00
parent 3931b8c70d 9c99354465
commit eaf5e1b3ec
2 changed files with 3 additions and 3 deletions
--- a/cc/library.go
+++ b/cc/library.go
@@ -1754,7 +1754,7 @@ func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) {
 					mayUseCoreVariant = false
 				}

-				if ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) && ctx.Arch().ArchType == android.Arm64 {
+				if ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) {
 					mayUseCoreVariant = false
 				}