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

Commit 5d793fb7 authored by Cindy Zhou's avatar Cindy Zhou
Browse files

Enable cfi for 32bit arch 

Enabling cfi for 32-bit arch; b/35157333 seems to have been resolved in b/67507331.

Bug: 158010610

Test: manual interaction with Wimbley device: youtube video, chrome
navigations, gmail
MPTS testing on Sargo

Change-Id: I79eeb7e880ea09d857f8339901b67f77243a575c
parent 8f8522a8

core/config_sanitizers.mk

+0 −6
Original line number Diff line number Diff line
@@ -122,12 +122,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))