am d82b7b55: am 808f0541: am 77128117: Merge "Set up dependency on ADDRESS_SANITIZER_LINKER"

* commit 'd82b7b55948739c0267333d6e0325526f5e07882':
  Set up dependency on ADDRESS_SANITIZER_LINKER
This commit is contained in:
Ying Wang 2015-08-18 00:29:22 +00:00 committed by Android Git Automerger
commit 57d78cda18
1 changed files with 3 additions and 0 deletions

View File

@ -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