Merge "Exempt UBSAN runtime library from soong_to_convert" am: 94751070e8

am: 0d694416d2

Change-Id: I948e0bc53a812ba64624d07e992ef1f727a19452
This commit is contained in:
Dan Willemsen 2017-05-03 01:26:10 +00:00 committed by android-build-merger
commit 97018accea

View file

@ -1814,10 +1814,11 @@ SOONG_CONV.$(LOCAL_MODULE).PROBLEMS := \
$(SOONG_CONV.$(LOCAL_MODULE).PROBLEMS) $(my_soong_problems)
SOONG_CONV.$(LOCAL_MODULE).DEPS := \
$(SOONG_CONV.$(LOCAL_MODULE).DEPS) \
$(my_static_libraries) \
$(my_whole_static_libraries) \
$(my_shared_libraries) \
$(my_system_shared_libraries)
$(filter-out $($(LOCAL_2ND_ARCH_VAR_PREFIX)UBSAN_RUNTIME_LIBRARY),\
$(my_static_libraries) \
$(my_whole_static_libraries) \
$(my_shared_libraries) \
$(my_system_shared_libraries))
SOONG_CONV := $(SOONG_CONV) $(LOCAL_MODULE)
endif