From 0bf506f44a4bde0149a47d78a72501b19c456a20 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 25 Apr 2017 15:42:14 -0700 Subject: [PATCH] Exempt UBSAN runtime library from soong_to_convert Soong already uses it, just not as a prebuilt module. Test: Compare soong_to_convert.txt before/after Change-Id: I6ffa0d967635d52b7b4f8b2b0465cd50254f22b9 --- core/binary.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/binary.mk b/core/binary.mk index 44a84aadd2..8a238ba6d9 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -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