commit 9588875e80a1ce3d8145cfbc6e53c087bbce9bc9
author Ivan Lozano <ivanlozano@google.com> Fri May 11 14:09:36 2018 -0700
committer Ivan Lozano <ivanlozano@google.com> Wed May 16 10:41:48 2018 -0700
tree ac412066dadf53837c3ec20445053b6f8a36d978
parent aee6e5dd3bcc492de32ebd1dcc8f36fd31ca83ce

Don't export UBSan minimal runtime symbols.

When linking in the UBSan minimal runtime, don't export the symbols.
This was resulting in an edge case where symbols were sometimes
undefined at runtime on address sanitized builds if static library
dependencies were integer overflow sanitized.

Bug: 78766744
Test: readelf on libraries show either inclusion of the shared library
or no undefined symbols related to the minimal runtime.
Change-Id: I4382cc72baefd7fa96cd83e8349e82f7b083f5aa
Merged-In: I4382cc72baefd7fa96cd83e8349e82f7b083f5aa
(cherry picked from commit e508169caf2a9c6d83b5d758023ed1d8f3b5d03e)

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 9ea1ff4..e0f8aca 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -330,6 +330,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)),)