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

Merge "Hide CFI behind a global flag." am: c0bf85a615

Browse Source 
am: 1bd8984ace

Change-Id: I8e1898c9bc087f66a2e1ed5a45c37a2340f419ad
This commit is contained in:
Vishwath Mohan
2017-01-20 01:50:38 +00:00
committed by android-build-merger
parent b7303cde95 1bd8984ace
commit 085a015abb
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/config_sanitizers.mk
View File

@@ -3,6 +3,7 @@
##############################################
my_sanitize := $(strip $(LOCAL_SANITIZE))
my_sanitize_diag := $(strip $(LOCAL_SANITIZE_DIAG))
# SANITIZE_HOST is only in effect if the module is already using clang (host
# modules that haven't set `LOCAL_CLANG := false` and device modules that
@@ -61,6 +62,12 @@ ifeq ($(LOCAL_SANITIZE),never)
my_sanitize :=
endif
# If CFI is disabled globally, remove it from my_sanitize.
ifeq ($(strip $(ENABLE_CFI)),)
my_sanitize := $(filter-out cfi,$(my_sanitize))
my_sanitize_diag := $(filter-out cfi,$(my_sanitize_diag))
endif
my_nosanitize = $(strip $(LOCAL_NOSANITIZE))
ifneq ($(my_nosanitize),)
my_sanitize := $(filter-out $(my_nosanitize),$(my_sanitize))
@@ -195,8 +202,8 @@ ifneq ($(strip $(LOCAL_SANITIZE_RECOVER)),)
my_cflags += -fsanitize-recover=$(recover_arg)
endif
ifneq ($(strip $(LOCAL_SANITIZE_DIAG)),)
notrap_arg := $(subst $(space),$(comma),$(LOCAL_SANITIZE_DIAG)),
ifneq ($(my_sanitize_diag),)
notrap_arg := $(subst $(space),$(comma),$(my_sanitize_diag)),
my_cflags += -fno-sanitize-trap=$(notrap_arg)
# Diagnostic requires a runtime library, unless ASan or TSan are also enabled.
ifeq ($(filter address thread,$(my_sanitize)),)