StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Apply SANITIZE_TARGET and LOCAL_SANITIZE when both are present.\"

Browse Source 
am: 9c88e0bfa2

Change-Id: I828de48b2f552801ec83c11f493eaaacb5f83e47
This commit is contained in:
Evgenii Stepanov
2016-07-01 20:17:39 +00:00
committed by android-build-merger
parent ae492fd5f2 9c88e0bfa2
commit 120112ee23
1 changed files with 4 additions and 6 deletions
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