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

This commit is contained in:
Alexey Polyudov
2018-03-28 17:47:50 +00:00
committed by Gerrit Code Review

View File

@@ -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