commit 03ad10369548cbf8031d4561c1fee1bea95a039e
author Treehugger Robot <treehugger-gerrit@google.com> Fri Dec 21 06:54:22 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 21 06:54:22 2018 +0000
tree 62f027e49df235bc2d1adfa799b6f18e9759eb8b
parent 92b623259b64be29fb63f8fd20197c9a83166fd5
parent aa73cefbc4cfbe398f5463e52da23a93280f338a

Merge "Use ASAN linker for native tests"

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 51b859e..6c9caa8 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -337,7 +337,7 @@
       my_ldflags += -Wl,--as-needed
     endif
 
-    ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)
+    ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)
       ifneq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
         my_linker := $($(LOCAL_2ND_ARCH_VAR_PREFIX)ADDRESS_SANITIZER_LINKER)
         # Make sure linker_asan get installed.