Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 539fef83 authored by Evgenii Stepanov's avatar Evgenii Stepanov Committed by android-build-merger
Browse files

resolve merge conflicts of ff3341b3 to stage-aosp-master am: e6350dfd 

am: 83ae8a4c

Change-Id: I5d8893e9da402aea5416e38a3b5c6ef9808d3b17
parents a3e8e9c6 83ae8a4c

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ LOCAL_DPI_VARIANTS:= 
LOCAL_DPI_FILE_STEM:=

LOCAL_SANITIZE:=

LOCAL_SANITIZE_RECOVER:=

LOCAL_NOSANITIZE:=

LOCAL_DATA_BINDING:=

LOCAL_DBUS_PROXY_PREFIX:=

LOCAL_INIT_RC:=

core/config_sanitizers.mk

+5 −0
Original line number Diff line number Diff line
@@ -59,6 +59,11 @@ ifeq ($(LOCAL_SANITIZE),never) 
  my_sanitize :=

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

# its use an error. For multilib cases, don't use it for the 32-bit case.

ifneq ($(filter thread,$(my_sanitize)),)