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

Commit af8f10f3 authored by Dan Albert's avatar Dan Albert Committed by android-build-merger
Browse files

Merge "Cleanup ASan build implementation." am: bf07f008 am: cebd6d73 am: 5118922b 

am: d9e0ab07

Change-Id: I042b2caf617713ea2e29d729f42cc2db4dc12433
parents 82726b10 d9e0ab07

core/config_sanitizers.mk

+0 −3
Original line number Diff line number Diff line
@@ -345,9 +345,6 @@ ifneq ($(filter address,$(my_global_sanitize) $(my_sanitize)),) 
      my_shared_libraries := $($(LOCAL_2ND_ARCH_VAR_PREFIX)ADDRESS_SANITIZER_RUNTIME_LIBRARY) \

                             $(my_shared_libraries)

    endif

    ifeq (,$(filter $(LOCAL_MODULE),$(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES)))

      my_static_libraries += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES)

    endif



    # Do not add unnecessary dependency in shared libraries.

    ifeq ($(LOCAL_MODULE_CLASS),SHARED_LIBRARIES)