Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97018acc authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

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

am: 0d694416

Change-Id: I948e0bc53a812ba64624d07e992ef1f727a19452
parents 4752d3cb 0d694416

core/binary.mk

+5 −4
Original line number Diff line number Diff line
@@ -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) \

    $(filter-out $($(LOCAL_2ND_ARCH_VAR_PREFIX)UBSAN_RUNTIME_LIBRARY),\

        $(my_static_libraries) \

        $(my_whole_static_libraries) \

        $(my_shared_libraries) \

    $(my_system_shared_libraries)

        $(my_system_shared_libraries))

SOONG_CONV := $(SOONG_CONV) $(LOCAL_MODULE)

endif