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

Commit 9bcd3ee0 authored by Alexey Polyudov's avatar Alexey Polyudov Committed by android-build-merger
Browse files

Merge "Do not use UBSAN library on HOST or AUX targets" 

am: ce814002

Change-Id: Id19cf7124c1e4c3915b81f070fdb3de943b062b6
parents 1bba4bfd ce814002

core/config_sanitizers.mk

+2 −2
Original line number Diff line number Diff line
@@ -324,8 +324,8 @@ ifneq ($(filter address,$(my_sanitize)),) 
  endif

endif



# Use minimal diagnostics when integer overflow is enabled

ifndef LOCAL_IS_HOST_MODULE

# Use minimal diagnostics when integer overflow is enabled; never do it for HOST or AUX modules

ifeq ($(LOCAL_IS_HOST_MODULE)$(LOCAL_IS_AUX_MODULE),)

  # Pre-emptively add UBSAN minimal runtime incase a static library dependency requires it

  ifeq ($(filter STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS)),)

    ifndef LOCAL_SDK_VERSION