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
diff --git a/target/product/aosp_arm64_ab.mk b/target/product/aosp_arm64_ab.mk
index 1dfd71c..63de7a2 100644
--- a/target/product/aosp_arm64_ab.mk
+++ b/target/product/aosp_arm64_ab.mk
@@ -28,7 +28,8 @@
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