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

Commit e6350dfd authored by Evgenii Stepanov's avatar Evgenii Stepanov
Browse files

resolve merge conflicts of ff3341b3 to stage-aosp-master

Change-Id: I1883410889b8e6c6505042fcebca6c8764e15e9a
parents db9f3489 ff3341b3
Loading
Loading
Loading
Loading
+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:=
+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,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)),)