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

Commit 4ff11f3f authored by Vishwath Mohan's avatar Vishwath Mohan Committed by android-build-merger
Browse files

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

am: f39badf5

Change-Id: Ifecb4a0695f93a3f86e3c06b92ef39c8170c1ed7
parents 339c1d8a f39badf5

core/config_sanitizers.mk

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




# Enable CFI in included paths.

# Enable CFI in included paths.

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

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) \

  combined_include_paths := $(CFI_INCLUDE_PATHS) \

                            $(PRODUCT_CFI_INCLUDE_PATHS)

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

    my_sanitize_diag := cfi $(my_sanitize_diag)

  endif

  endif

endif

endif

endif





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

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

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

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

target/product/embedded.mk

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

    system/core/rootdir/init.usb.configfs.rc:root/init.usb.configfs.rc \

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

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

    system/core/rootdir/etc/hosts:system/etc/hosts
 
    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 \