tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolve merge conflicts of ff3341b to stage-aosp-master

Browse source 
Change-Id: I1883410889b8e6c6505042fcebca6c8764e15e9a
This commit is contained in:
Evgenii Stepanov 2016-06-30 16:34:49 -07:00
commit e6350dfddd
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/clear_vars.mk
View file

@ -194,6 +194,7 @@ LOCAL_DPI_VARIANTS:=
LOCAL_DPI_FILE_STEM:= LOCAL_DPI_FILE_STEM:=
LOCAL_SANITIZE:= LOCAL_SANITIZE:=
LOCAL_SANITIZE_RECOVER:= LOCAL_SANITIZE_RECOVER:=
LOCAL_NOSANITIZE:=
LOCAL_DATA_BINDING:= LOCAL_DATA_BINDING:=
LOCAL_DBUS_PROXY_PREFIX:= LOCAL_DBUS_PROXY_PREFIX:=
LOCAL_INIT_RC:= LOCAL_INIT_RC:=

5
core/config_sanitizers.mk
View file

@ -34,6 +34,11 @@ ifeq ($(LOCAL_SANITIZE),never)
my_sanitize := my_sanitize :=
endif endif
my_nosanitize = $(strip $(LOCAL_NOSANITIZE))
ifneq ($(my_nosanitize),)
my_sanitize := $(filter-out $(my_nosanitize),$(my_sanitize))
endif
# TSAN is not supported on 32-bit architectures. For non-multilib cases, make # TSAN is not supported on 32-bit architectures. For non-multilib cases, make
# its use an error. For multilib cases, don't use it for the 32-bit case. # its use an error. For multilib cases, don't use it for the 32-bit case.
ifneq ($(filter thread,$(my_sanitize)),) ifneq ($(filter thread,$(my_sanitize)),)