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.libarttest.mk b/build/Android.libarttest.mk
index 7726df0..bb2600c 100644
--- a/build/Android.libarttest.mk
+++ b/build/Android.libarttest.mk
@@ -37,12 +37,13 @@
LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
ifeq ($$(art_target_or_host),target)
LOCAL_CFLAGS := $(ART_TARGET_CFLAGS) $(ART_TARGET_DEBUG_CFLAGS)
- LOCAL_SHARED_LIBRARIES += libdl libstlport
+ LOCAL_SHARED_LIBRARIES += libdl libstlport libdynamic_annotations
LOCAL_STATIC_LIBRARIES := libgtest
LOCAL_MODULE_PATH := $(ART_TEST_OUT)
include $(BUILD_SHARED_LIBRARY)
else # host
LOCAL_CFLAGS := $(ART_HOST_CFLAGS) $(ART_HOST_DEBUG_CFLAGS)
+ LOCAL_SHARED_LIBRARIES += libdynamic_annotations-host
LOCAL_LDLIBS := -ldl -lpthread
ifeq ($(HOST_OS),linux)
LOCAL_LDLIBS += -lrt