Merge "Link tsan shared library when tsan is used."

am: c29a1160c5 Change-Id: I30ed3425a2a1f1a2b9831ecb612cccabc03116a1
2017-10-20 18:04:29 +00:00 · 2017-10-20 18:04:29 +00:00 · 7b0836d41d
parent f55aae7211 c29a1160c5
commit 7b0836d41d
1 changed files with 2 additions and 0 deletions
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@ -137,6 +137,8 @@ ifneq ($(filter thread,$(my_sanitize)),)
    else
        $(error $(LOCAL_PATH): $(LOCAL_MODULE): TSAN cannot be used for 32-bit modules.)
    endif
+  else
+    my_shared_libraries += $(TSAN_RUNTIME_LIBRARY)
  endif
 endif