StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Exempt UBSAN runtime library from soong_to_convert"

Browse Source 
am: 94751070e8

Change-Id: Ib66aa922b885d8d6e0bd99836ddd684b14e214a3
This commit is contained in:
Dan Willemsen
2017-05-03 01:24:11 +00:00
committed by android-build-merger
parent 1f632e7a5e 94751070e8
commit 0d694416d2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/binary.mk
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