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

Commit 55309f84 authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

am 959f0ecc: Merge "Add LOCAL_SANITIZE_RECOVER." 

* commit '959f0ecc':
  Add LOCAL_SANITIZE_RECOVER.
parents 162e1906 959f0ecc

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ LOCAL_NATIVE_COVERAGE := 
LOCAL_DPI_VARIANTS:=

LOCAL_DPI_FILE_STEM:=

LOCAL_SANITIZE:=

LOCAL_SANITIZE_RECOVER:=



# arch specific variables

LOCAL_SRC_FILES_$(TARGET_ARCH):=

core/config_sanitizers.mk

+8 −0
Original line number Diff line number Diff line
@@ -86,9 +86,17 @@ ifneq ($(filter address,$(my_sanitize)),) 
endif



ifneq ($(filter undefined,$(my_sanitize)),)

  my_cflags += -fno-sanitize-recover=all



  ifdef LOCAL_IS_HOST_MODULE

    my_ldlibs += -ldl

  else

    $(error ubsan is not yet supported on the target)

  endif

endif





ifeq ($(strip $(LOCAL_SANITIZE_RECOVER)),true)

  recover_arg := $(subst $(space),$(comma),$(my_sanitize)),

  my_cflags += -fsanitize-recover=$(recover_arg)

endif