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

Commit aa5c8dce authored by Cindy Zhou's avatar Cindy Zhou Committed by Automerger Merge Worker
Browse files

Merge "Enable cfi for 32bit arch" am: e48dccaa am: 086efc21 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a3a48b617ff64dddbf4ca39ff7f4e0941dabb70
parents 70bee74f 086efc21

core/config_sanitizers.mk

+0 −6
Original line number Diff line number Diff line
@@ -153,12 +153,6 @@ ifeq ($(strip $(ENABLE_CFI)),false) 
  my_sanitize_diag := $(filter-out cfi,$(my_sanitize_diag))

endif



# Disable CFI for arm32 (b/35157333).

ifneq ($(filter arm,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)),)

  my_sanitize := $(filter-out cfi,$(my_sanitize))

  my_sanitize_diag := $(filter-out cfi,$(my_sanitize_diag))

endif



# Also disable CFI if ASAN is enabled.

ifneq ($(filter address,$(my_sanitize)),)

  my_sanitize := $(filter-out cfi,$(my_sanitize))