commit 0ec0360a1944c4572abadef26c4e332490a6f295
author Ivan Lozano <ivanlozano@google.com> Tue May 15 13:20:39 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 15 13:20:39 2018 -0700
tree 95f942210c0998912d48af586230a49be2950f24
parent 18b5919723065b0d3d96a81344bfbf2b0147a7bd
parent 6516a40a4e79bf625d15ac8d00b454e1755054a6

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

Change-Id: I8821d847a6cd80432f7f63c42d5dad50ded6f23f

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