From a05e22236866b5b171c90c14b6974cb44ce3a795 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 17 Aug 2015 16:13:24 -0700 Subject: [PATCH] Set up dependency on ADDRESS_SANITIZER_LINKER Set up dependency on ADDRESS_SANITIZER_LINKER if address sanitizer is enabled. Bug: 22850550 Change-Id: I736fe1d4db9594edf9e82ae96e4631887881dfa5 --- core/config_sanitizers.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk index 78cedad68..8d285b1d8 100644 --- a/core/config_sanitizers.mk +++ b/core/config_sanitizers.mk @@ -108,7 +108,10 @@ ifneq ($(filter address,$(my_sanitize)),) $(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES) my_static_libraries += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES) my_ldflags += -Wl,-rpath,$($(LOCAL_2ND_ARCH_VAR_PREFIX)ADDRESS_SANITIZER_RPATH) + 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