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

Commit c66e36a3 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge \\"Only add linker_asan as dependency to shared executables\\" am: 458c0cd3 

am: 3721f184

Change-Id: Ia031bb4f71fb6486c184e401f1b2798b41a1ce65
parents 2017d689 3721f184

core/config_sanitizers.mk

+7 −3
Original line number Diff line number Diff line
@@ -157,11 +157,15 @@ ifneq ($(filter address,$(my_global_sanitize) $(my_sanitize)),) 
      my_ldflags += -Wl,--as-needed

    endif



    ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)

      ifneq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)

        my_linker := $($(LOCAL_2ND_ARCH_VAR_PREFIX)ADDRESS_SANITIZER_LINKER)

        # Make sure linker_asan get installed.

        $(LOCAL_INSTALLED_MODULE) : | $(PRODUCT_OUT)$($(LOCAL_2ND_ARCH_VAR_PREFIX)ADDRESS_SANITIZER_LINKER)

      endif

    endif

  endif

endif



# If local module needs ASAN, add compiler flags.

ifneq ($(filter address,$(my_sanitize)),)