commit b757ed06fc00a98ad5ec4001f89154c0e1f395c5
author Mathieu Chartier <mathieuc@google.com> Thu May 24 00:28:15 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 24 00:28:15 2018 +0000
tree d543de62b9f09f63c5c4d63a526fe818e2acdd33
parent 0784f0eaf59f567d1f3254aba5d113346984aa87
parent 96a8c23a73d4489d28a90bae010572a120e919ff

Merge "Allow profiles for vendor modules" into pi-dev

target/product/aosp_arm64_ab.mk

diff --git a/target/product/aosp_arm64_ab.mk b/target/product/aosp_arm64_ab.mk
index c96cb91..1dfd71c 100644
--- a/target/product/aosp_arm64_ab.mk
+++ b/target/product/aosp_arm64_ab.mk
@@ -27,6 +27,9 @@
     update_engine \
     update_verifier
 
+# Enable control-flow integrity (CFI) for security sensitive components
+$(call inherit-product, build/make/target/product/cfi-common.mk)
+
 PRODUCT_NAME := aosp_arm64_ab
 PRODUCT_DEVICE := generic_arm64_ab
 PRODUCT_BRAND := Android