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

Commit a143397a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Make)"

parents e67bbf39 f03a2657

core/config_sanitizers.mk

+11 −7
Original line number Diff line number Diff line
@@ -98,6 +98,9 @@ endif 


# Enable CFI in included paths.

ifeq ($(filter cfi, $(my_sanitize)),)

# Do not rely on include paths for anything other than ARM64.

# TODO: Relax this constraint for 2019.

  ifneq ($(filter arm64,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)),)

    combined_include_paths := $(CFI_INCLUDE_PATHS) \

                              $(PRODUCT_CFI_INCLUDE_PATHS)
@@ -107,6 +110,7 @@ ifeq ($(filter cfi, $(my_sanitize)),) 
      my_sanitize_diag := cfi $(my_sanitize_diag)

    endif

  endif

endif



# If CFI is disabled globally, remove it from my_sanitize.

ifeq ($(strip $(ENABLE_CFI)),false)

target/product/embedded.mk

+24 −0
Original line number Diff line number Diff line
@@ -121,3 +121,27 @@ PRODUCT_COPY_FILES += \ 
    system/core/rootdir/init.usb.configfs.rc:root/init.usb.configfs.rc \

    system/core/rootdir/ueventd.rc:root/ueventd.rc \

    system/core/rootdir/etc/hosts:system/etc/hosts



# This is a set of common components to enable CFI for (across

# compatible product configs)

PRODUCT_CFI_INCLUDE_PATHS :=  \

    device/google/cuttlefish_common/guest/libs/wpa_supplicant_8_lib \

    device/google/wahoo/wifi_offload \

    external/tinyxml2 \

    external/wpa_supplicant_8 \

    frameworks/av/camera \

    frameworks/av/media \

    frameworks/av/services \

    frameworks/minikin \

    hardware/broadcom/wlan/bcmdhd/wpa_supplicant_8_lib \

    hardware/interfaces/nfc \

    hardware/qcom/wlan/qcwcn/wpa_supplicant_8_lib \

    harware/interfaces/keymaster \

    system/bt \

    system/chre \

    system/core/libnetutils \

    system/core/libziparchive \

    system/gatekeeper \

    system/keymaster \

    system/nfc \

    system/security \