commit 57d78cda18c111d1d6f2f69fdbbc78f29f7b9eb7
author Ying Wang <wangying@android.com> Tue Aug 18 00:29:22 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 18 00:29:22 2015 +0000
tree b94f8272bff6afeb0acce0290ff4c5f234346652
parent 401765009df5d58ec21829ac4bb664081a59432c
parent d82b7b55948739c0267333d6e0325526f5e07882

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

* commit 'd82b7b55948739c0267333d6e0325526f5e07882':
  Set up dependency on ADDRESS_SANITIZER_LINKER

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 78cedad..8d285b1 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -108,7 +108,10 @@
                            $(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