Apply CFI include paths to all product configs.
am: f8d4dc5787
Change-Id: I62739ecb272c088d7468b7bdf47bf923a42be079
This commit is contained in:
commit
7bfd882a23
4 changed files with 4 additions and 12 deletions
|
@ -27,10 +27,6 @@ PRODUCT_PACKAGES += \
|
|||
update_engine \
|
||||
update_verifier
|
||||
|
||||
# Enable control-flow integrity (CFI) for security sensitive components
|
||||
$(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
|
||||
PRODUCT_BRAND := Android
|
||||
|
|
|
@ -31,7 +31,3 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32
|
|||
|
||||
TARGET_SUPPORTS_32_BIT_APPS := true
|
||||
TARGET_SUPPORTS_64_BIT_APPS := true
|
||||
|
||||
# Enable CFI for security-sensitive components
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/cfi-common.mk)
|
||||
$(call inherit-product-if-exists, vendor/google/products/cfi-vendor.mk)
|
||||
|
|
|
@ -28,7 +28,3 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64
|
|||
|
||||
TARGET_SUPPORTS_32_BIT_APPS := false
|
||||
TARGET_SUPPORTS_64_BIT_APPS := true
|
||||
|
||||
# Enable CFI for security-sensitive components
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/cfi-common.mk)
|
||||
$(call inherit-product-if-exists, vendor/google/products/cfi-vendor.mk)
|
||||
|
|
|
@ -178,3 +178,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
|
|||
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)
|
||||
|
||||
# Enable CFI for security-sensitive components
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/cfi-common.mk)
|
||||
$(call inherit-product-if-exists, vendor/google/products/cfi-vendor.mk)
|
||||
|
|
Loading…
Reference in a new issue