Turn on some basic tsan annotations.
The most useful bit here is that tsan now knows the names of our threads.
Change-Id: I8eef8f31e954ffc373555b392d6d9678d76ead34
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 92fd96a..a2dc923 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -44,6 +44,11 @@
LOCAL_SRC_FILES := $$(art_gtest_filename)
LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
LOCAL_SHARED_LIBRARIES := libartd
+ ifeq ($$(art_target_or_host),target)
+ LOCAL_SHARED_LIBRARIES += libdynamic_annotations
+ else
+ LOCAL_SHARED_LIBRARIES += libdynamic_annotations-host
+ endif
# Mac OS linker doesn't understand --export-dynamic.
ifneq ($(HOST_OS)-$$(art_target_or_host),darwin-host)