Merge "Only add linker_asan as dependency to shared executables"

This commit is contained in:
Colin Cross
2016-07-17 23:38:39 +00:00
committed by Gerrit Code Review

View File

@@ -157,9 +157,13 @@ ifneq ($(filter address,$(my_global_sanitize) $(my_sanitize)),)
my_ldflags += -Wl,--as-needed
endif
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)
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