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

am: 910c257a72

Change-Id: I5b45e2d7afd24d7e6fe145d21fadb6840fecc9c1
This commit is contained in:
Ivan Lozano 2018-05-15 13:04:21 -07:00 committed by android-build-merger
commit 6516a40a4e

View file

@ -345,6 +345,7 @@ ifeq ($(LOCAL_IS_HOST_MODULE)$(LOCAL_IS_AUX_MODULE),)
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)),)