commit 458c0cd37b665f9c89718a6c9de22b3f85e7209c
author Colin Cross <ccross@android.com> Sun Jul 17 23:38:39 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Jul 17 23:38:39 2016 +0000
tree 7f822d8471de8c301f6abbcf49af8b1bfa352f52
parent 1e92cfb9a0a23f54413825d663d004d36008e34e
parent d08699e4641294d7a1dce0dce0ea9c62eee18984

Merge "Only add linker_asan as dependency to shared executables"

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 7882fdf..ac3e4fc 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -157,9 +157,13 @@
       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