commit 94751070e8204103d10136f73fff59022c87cee9
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 03 01:18:58 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 03 01:18:58 2017 +0000
tree 3c8444e94753f168a424eff777a0fb967914fdd2
parent 3465f2ad5697e3f91ad2b612b4a1909067ca4b94
parent 0bf506f44a4bde0149a47d78a72501b19c456a20

Merge "Exempt UBSAN runtime library from soong_to_convert"

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 44a84aa..8a238ba 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -1814,10 +1814,11 @@
     $(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