commit 078d4995b7bb55d5d3bf04e967a26468d7924230
author Ivan Lozano <ivanlozano@google.com> Tue May 15 19:44:32 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 15 19:44:32 2018 +0000
tree 8185718fae60563bf27fafd867aba75735b75d41
parent 3e83e841151e732ccc08d4ec6ef2ded38715f68c
parent e508169caf2a9c6d83b5d758023ed1d8f3b5d03e

Merge "Don't export UBSan minimal runtime symbols."

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index aa591ec..1363c8d 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -345,6 +345,7 @@
   ifeq ($(filter STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS)),)
     ifndef LOCAL_SDK_VERSION
       my_static_libraries += $($(LOCAL_2ND_ARCH_VAR_PREFIX)UBSAN_MINIMAL_RUNTIME_LIBRARY)
+      my_ldflags += -Wl,--exclude-libs,$($(LOCAL_2ND_ARCH_VAR_PREFIX)UBSAN_MINIMAL_RUNTIME_LIBRARY).a
     endif
   endif
   ifneq ($(filter unsigned-integer-overflow signed-integer-overflow integer,$(my_sanitize)),)