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

Commit 387c319a authored by Vishwath Mohan's avatar Vishwath Mohan Committed by android-build-merger
Browse files

Merge "Disable CFI for ASAN targets. (Make)" am: 594eb16b am: eac1397c 

am: 385674cc

Change-Id: I2b30d55d721b4b8c05bff5febf30cf1629536bba
parents 2a94e9dc 385674cc

core/config_sanitizers.mk

+6 −0
Original line number Diff line number Diff line
@@ -74,6 +74,12 @@ ifneq ($(filter arm,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)),) 
  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))

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

endif



# CFI needs gold linker, and mips toolchain does not have one.

ifneq ($(filter mips mips64,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)),)

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