commit ce81400244f940088969808b5974e06fa6c6b04e
author Alexey Polyudov <apolyudov@google.com> Wed Mar 28 17:47:50 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 28 17:47:50 2018 +0000
tree 8003fd66037c3773e5d19a8131797aeacf7f62c7
parent c209fb179969a2a44dc0071d506135b7ee178212
parent e98e5625ad5e1004a9bf589518906229371b4eba

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

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 35d077c..9ea1ff4 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -324,8 +324,8 @@
   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