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

Merge "Allow PRODUCT_CFI_INCLUDE_PATHS to work with 32-bit builds"

Browse Source
This commit is contained in:
Treehugger Robot
2021-04-19 23:00:57 +00:00
committed by Gerrit Code Review
parent 9dbecd650f 064d91c49b
commit b4863637a2
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/config_sanitizers.mk
View File

@@ -115,9 +115,8 @@ ifeq ($(LOCAL_SANITIZE),never)
my_sanitize_diag := my_sanitize_diag :=
endif endif
# Enable CFI in included paths (for Arm64 only). # Enable CFI in included paths.
ifeq ($(filter cfi, $(my_sanitize)),) ifeq ($(filter cfi, $(my_sanitize)),)
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)
combined_exclude_paths := $(CFI_EXCLUDE_PATHS) \ combined_exclude_paths := $(CFI_EXCLUDE_PATHS) \
@@ -130,7 +129,6 @@ ifeq ($(filter cfi, $(my_sanitize)),)
my_sanitize := cfi $(my_sanitize) my_sanitize := cfi $(my_sanitize)
endif endif
endif endif
endif
endif endif
# Enable memtag_heap in included paths (for Arm64 only). # Enable memtag_heap in included paths (for Arm64 only).