diff options
| author | Elliott Hughes <enh@google.com> | 2012-02-07 14:51:57 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-02-07 15:09:59 -0800 |
| commit | 06e3ad4a651c2c58dba5e865cd06d2f98462bf1d (patch) | |
| tree | 8110ea5a4880e0a6b2c39ce26dab934af29a91c0 /build/Android.libarttest.mk | |
| parent | bd411021057416e56a1544b98831b92faf66a1a1 (diff) | |
| download | art-06e3ad4a651c2c58dba5e865cd06d2f98462bf1d.zip art-06e3ad4a651c2c58dba5e865cd06d2f98462bf1d.tar.gz art-06e3ad4a651c2c58dba5e865cd06d2f98462bf1d.tar.bz2 | |
Turn on some basic tsan annotations.
The most useful bit here is that tsan now knows the names of our threads.
Change-Id: I8eef8f31e954ffc373555b392d6d9678d76ead34
Diffstat (limited to 'build/Android.libarttest.mk')
| -rw-r--r-- | build/Android.libarttest.mk | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ define build-libarttest 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 |