From 014d1fc9692aee8eecb95379452cc1dbe846c44b Mon Sep 17 00:00:00 2001 From: Vishwath Mohan Date: Fri, 25 May 2018 07:01:09 -0700 Subject: [PATCH] Enable CFI for vendor components on aosp_arm64_ab product-configs The aosp_arm64_ab product config needs to also enable CFI for some vendor components (if they exist). Bug: 66301104 Test: lunch aosp_arm64_ab-userdebug && m -j40 Change-Id: Iae670c2d44c00d3dfb0e312e1492b37bbb737d4f --- target/product/aosp_arm64_ab.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/product/aosp_arm64_ab.mk b/target/product/aosp_arm64_ab.mk index 1dfd71c9c2..63de7a2223 100644 --- a/target/product/aosp_arm64_ab.mk +++ b/target/product/aosp_arm64_ab.mk @@ -28,7 +28,8 @@ PRODUCT_PACKAGES += \ update_verifier # Enable control-flow integrity (CFI) for security sensitive components -$(call inherit-product, build/make/target/product/cfi-common.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/cfi-common.mk) +$(call inherit-product-if-exists, vendor/google/products/cfi-vendor.mk) PRODUCT_NAME := aosp_arm64_ab PRODUCT_DEVICE := generic_arm64_ab