commit 6516a40a4e79bf625d15ac8d00b454e1755054a6
author Ivan Lozano <ivanlozano@google.com> Tue May 15 13:04:21 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 15 13:04:21 2018 -0700
tree c84b4f93294a857df26297cb612019a5236ab71f
parent df24c51b2495d8ae8e99591da434ca3f536a7fa3
parent 910c257a72268f57dd59adc99b31256541be0327

Merge "Don't export UBSan minimal runtime symbols." am: 078d4995b7
am: 910c257a72

Change-Id: I5b45e2d7afd24d7e6fe145d21fadb6840fecc9c1

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)),)