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" am: b4863637a2 am: cb760624f0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1675585

Change-Id: Ie043b2c3080f32dc8b33cf9e3f68953e21c39fad
This commit is contained in:
Treehugger Robot
2021-04-19 23:38:55 +00:00
committed by Automerger Merge Worker
parent a919d1d457 cb760624f0
commit 538d4135dc
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 :=
endif
# Enable CFI in included paths (for Arm64 only).
# Enable CFI in included paths.
ifeq ($(filter cfi, $(my_sanitize)),)
ifneq ($(filter arm64,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)),)
combined_include_paths := $(CFI_INCLUDE_PATHS) \
$(PRODUCT_CFI_INCLUDE_PATHS)
combined_exclude_paths := $(CFI_EXCLUDE_PATHS) \
@@ -131,7 +130,6 @@ ifeq ($(filter cfi, $(my_sanitize)),)
endif
endif
endif
endif
# Enable memtag_heap in included paths (for Arm64 only).
ifeq ($(filter memtag_heap, $(my_sanitize)),)