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

Commit ed787278 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Have the sanitizers trap rather than abort." into main am: 14e0d156... 

Merge "Have the sanitizers trap rather than abort." into main am: 14e0d156 am: 18b102d5 am: ba84ad5c

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



Change-Id: If5b39532e758f135c2d2fad534a4e0c75fe3b171
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d2d3e37 ba84ad5c

core/config_sanitizers.mk

+0 −1
Original line number Diff line number Diff line
@@ -404,7 +404,6 @@ ifneq ($(my_sanitize),) 
    my_ldflags += -fsanitize=$(fsanitize_arg)

  else

    my_cflags += -fsanitize-trap=all

    my_cflags += -ftrap-function=abort

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

      my_cflags += -fno-sanitize-trap=address,thread

      my_shared_libraries += libdl