StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
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.
ifeq ($(filter cfi, $(my_sanitize)),)
combined_include_paths := $(CFI_INCLUDE_PATHS) \
$(PRODUCT_CFI_INCLUDE_PATHS)
# 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)
ifneq ($(strip $(foreach dir,$(subst $(comma),$(space),$(combined_include_paths)),\
$(filter $(dir)%,$(LOCAL_PATH)))),)
my_sanitize := cfi $(my_sanitize)
my_sanitize_diag := cfi $(my_sanitize_diag)
ifneq ($(strip $(foreach dir,$(subst $(comma),$(space),$(combined_include_paths)),\
$(filter $(dir)%,$(LOCAL_PATH)))),)
my_sanitize := cfi $(my_sanitize)
my_sanitize_diag := cfi $(my_sanitize_diag)
endif
endif
endif