Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bfd882a authored by Vishwath Mohan's avatar Vishwath Mohan Committed by android-build-merger
Browse files

Apply CFI include paths to all product configs. 

am: f8d4dc57

Change-Id: I62739ecb272c088d7468b7bdf47bf923a42be079
parents d4328a80 f8d4dc57

target/product/aosp_arm64_ab.mk

+0 −4
Original line number Diff line number Diff line
@@ -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

target/product/core_64_bit.mk

+0 −4
Original line number Diff line number Diff line
@@ -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)

target/product/core_64_bit_only.mk

+0 −4
Original line number Diff line number Diff line
@@ -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)

target/product/core_minimal.mk

+4 −0
Original line number Diff line number Diff line
@@ -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)