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

Commit c026f6d0 authored by Vishwath Mohan's avatar Vishwath Mohan
Browse files

Disable CFI for ASAN targets. (Make) 

This CL disables CFI if both CFI and ASAN flags are enabled. This
allows ASAN to take precedence where needed, preventing build errors
that would otherwise arise.

Bug: 30227045
Test: SANITIZE_TARGET="address" m -j40
Change-Id: I9073ace0a10eb554d14e418a9b23cc8a8277607d
parent eddf74ca

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))