p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Apply SANITIZE_TARGET and LOCAL_SANITIZE when both are present. 

The idea is that targets with LOCAL_SANITIZE = signed-integer-overflow
and SANITIZE_TARGET=safe-stack should get both sanitizers.
This should work just fine for SANITIZE_TARGET=address, too.

Bug: 27729263
Change-Id: Ifee350da4877008fb061bc7f6c700e7fade405bc
This commit is contained in:
Evgenii Stepanov 2016-05-19 17:45:21 -07:00
parent 9d73af0934
commit 71faa1990b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/config_sanitizers.mk
View File

@ -19,9 +19,8 @@ ifeq ($(my_clang),true)
endif
endif
# The sanitizer specified by the environment wins over the module.
ifneq ($(my_global_sanitize),)
my_sanitize := $(my_global_sanitize)
my_sanitize := $(my_global_sanitize) $(my_sanitize)
endif
# The sanitizer specified in the product configuration wins over the previous.
@ -118,11 +117,10 @@ ifneq ($(my_sanitize),)
my_ldflags += -fsanitize=$(fsanitize_arg)
my_ldlibs += -lrt -ldl
else
ifeq ($(filter address,$(my_sanitize)),)
my_cflags += -fsanitize-trap=all
my_cflags += -ftrap-function=abort
endif
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
endif
endif