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

Commit 5e0a2354 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow PRODUCT_CFI_INCLUDE_PATHS to work with 32-bit builds" am:... 

Merge "Allow PRODUCT_CFI_INCLUDE_PATHS to work with 32-bit builds" am: b4863637 am: cb760624 am: 538d4135

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

Change-Id: I1294cf6838fb8630c01288c89b2f1ea486fcc358
parents a4696936 538d4135

core/config_sanitizers.mk

+11 −13
Original line number Diff line number Diff line
@@ -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)),)