openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Treehugger Robot 2018-03-29 22:55:35 +00:00 committed by Gerrit Code Review
parent e67bbf39fc f03a265786
commit a143397aee
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/config_sanitizers.mk
View File

@ -98,13 +98,17 @@ endif
# Enable CFI in included paths. # Enable CFI in included paths.
ifeq ($(filter cfi, $(my_sanitize)),) ifeq ($(filter cfi, $(my_sanitize)),)
combined_include_paths := $(CFI_INCLUDE_PATHS) \ # Do not rely on include paths for anything other than ARM64.
$(PRODUCT_CFI_INCLUDE_PATHS) # 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)
ifneq ($(strip $(foreach dir,$(subst $(comma),$(space),$(combined_include_paths)),\ ifneq ($(strip $(foreach dir,$(subst $(comma),$(space),$(combined_include_paths)),\
$(filter $(dir)%,$(LOCAL_PATH)))),) $(filter $(dir)%,$(LOCAL_PATH)))),)
my_sanitize := cfi $(my_sanitize) my_sanitize := cfi $(my_sanitize)
my_sanitize_diag := cfi $(my_sanitize_diag) my_sanitize_diag := cfi $(my_sanitize_diag)
endif
endif endif
endif endif

24
target/product/embedded.mk
View File

@ -121,3 +121,27 @@ 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 \