Merge "Do not use UBSAN library on HOST or AUX targets"
am: ce81400244
Change-Id: Id19cf7124c1e4c3915b81f070fdb3de943b062b6
This commit is contained in:
commit
9bcd3ee0dd
|
@ -324,8 +324,8 @@ ifneq ($(filter address,$(my_sanitize)),)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Use minimal diagnostics when integer overflow is enabled
|
# Use minimal diagnostics when integer overflow is enabled; never do it for HOST or AUX modules
|
||||||
ifndef LOCAL_IS_HOST_MODULE
|
ifeq ($(LOCAL_IS_HOST_MODULE)$(LOCAL_IS_AUX_MODULE),)
|
||||||
# Pre-emptively add UBSAN minimal runtime incase a static library dependency requires it
|
# Pre-emptively add UBSAN minimal runtime incase a static library dependency requires it
|
||||||
ifeq ($(filter STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS)),)
|
ifeq ($(filter STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS)),)
|
||||||
ifndef LOCAL_SDK_VERSION
|
ifndef LOCAL_SDK_VERSION
|
||||||
|
|
Loading…
Reference in New Issue