Merge "Have the sanitizers trap rather than abort." into main am: 14e0d156fb
am: 18b102d5c0
am: ba84ad5c90
Original change: https://android-review.googlesource.com/c/platform/build/+/2777875 Change-Id: If5b39532e758f135c2d2fad534a4e0c75fe3b171 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user