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

Commit ba84ad5c 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 am: 18b102d5 

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



Change-Id: Ic9addf8e73f8dceb64eebbe2991e5e5efa7fc17d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ea4ee44 18b102d5

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