diff options
| -rw-r--r-- | Android.mk | 6 | ||||
| -rw-r--r-- | build/Android.common.mk | 1 | ||||
| -rw-r--r-- | build/Android.executable.mk | 5 | ||||
| -rw-r--r-- | build/Android.gtest.mk | 5 | ||||
| -rw-r--r-- | build/Android.libart.mk | 2 | ||||
| -rw-r--r-- | build/Android.libarttest.mk | 3 | ||||
| -rw-r--r-- | src/gc/card_table.cc | 3 | ||||
| -rw-r--r-- | src/thread.cc | 1 | ||||
| -rw-r--r-- | src/utils.cc | 3 |
9 files changed, 1 insertions, 28 deletions
diff --git a/Android.mk b/Android.mk index 57339ec9ed..981f476dce 100644 --- a/Android.mk +++ b/Android.mk @@ -181,12 +181,6 @@ valgrind-test-art-host-gtest: test-art-host-dependencies $(call run-host-gtests-with,valgrind --leak-check=full) @echo valgrind-test-art-host-gtest PASSED -# "mm tsan-test-art-host-gtest" to build and run the host gtests under tsan. -.PHONY: tsan-test-art-host-gtest -tsan-test-art-host-gtest: test-art-host-dependencies - $(call run-host-gtests-with,"tsan") - @echo tsan-test-art-host-gtest PASSED - .PHONY: test-art-host-oat test-art-host-oat: $(ART_TEST_HOST_OAT_TARGETS) @echo test-art-host-oat PASSED diff --git a/build/Android.common.mk b/build/Android.common.mk index 55dd7ef6a9..3bf8de4df7 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -45,7 +45,6 @@ ART_CPP_EXTENSION := .cc ART_C_INCLUDES := \ external/gtest/include \ - external/valgrind/dynamic_annotations \ external/zlib \ frameworks/compile/mclinker/include \ art/src diff --git a/build/Android.executable.mk b/build/Android.executable.mk index afb335eab5..b30e27be48 100644 --- a/build/Android.executable.mk +++ b/build/Android.executable.mk @@ -81,11 +81,6 @@ define build-art-executable LOCAL_SHARED_LIBRARIES += libart else # debug LOCAL_SHARED_LIBRARIES += libartd - ifeq ($$(art_target_or_host),target) - LOCAL_SHARED_LIBRARIES += libdynamic_annotations - else - LOCAL_SHARED_LIBRARIES += libdynamic_annotations-host - endif endif ifeq ($$(art_target_or_host),target) diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 2dd63af66e..c8aded5059 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -51,11 +51,6 @@ define build-art-test LOCAL_SRC_FILES := $$(art_gtest_filename) src/common_test.cc 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) diff --git a/build/Android.libart.mk b/build/Android.libart.mk index 67461be907..cbc78b28f1 100644 --- a/build/Android.libart.mk +++ b/build/Android.libart.mk @@ -94,11 +94,9 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : art/%.h LOCAL_SHARED_LIBRARIES += libcorkscrew # native stack trace support ifeq ($$(art_target_or_host),target) LOCAL_SHARED_LIBRARIES += libcutils libstlport libz libdl libselinux - LOCAL_SHARED_LIBRARIES += libdynamic_annotations # tsan support else # host LOCAL_STATIC_LIBRARIES += libcutils LOCAL_SHARED_LIBRARIES += libz-host - LOCAL_SHARED_LIBRARIES += libdynamic_annotations-host # tsan support LOCAL_LDLIBS += -ldl -lpthread ifeq ($(HOST_OS),linux) LOCAL_LDLIBS += -lrt diff --git a/build/Android.libarttest.mk b/build/Android.libarttest.mk index a3dee807f3..855523b43d 100644 --- a/build/Android.libarttest.mk +++ b/build/Android.libarttest.mk @@ -39,13 +39,12 @@ 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 libdynamic_annotations + LOCAL_SHARED_LIBRARIES += libdl libstlport 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 diff --git a/src/gc/card_table.cc b/src/gc/card_table.cc index e053a06644..57824e90db 100644 --- a/src/gc/card_table.cc +++ b/src/gc/card_table.cc @@ -16,8 +16,6 @@ #include "card_table.h" -#include <dynamic_annotations.h> - #include "base/logging.h" #include "gc/card_table-inl.h" #include "heap.h" @@ -82,7 +80,6 @@ CardTable::CardTable(MemMap* mem_map, byte* biased_begin, size_t offset) : mem_map_(mem_map), biased_begin_(biased_begin), offset_(offset) { byte* __attribute__((unused)) begin = mem_map_->Begin() + offset_; byte* __attribute__((unused)) end = mem_map_->End(); - ANNOTATE_BENIGN_RACE_SIZED(begin, (end - begin), "writes to GC card table"); } void CardTable::ClearSpaceCards(ContinuousSpace* space) { diff --git a/src/thread.cc b/src/thread.cc index a85d22ac01..cfd8eb71ff 100644 --- a/src/thread.cc +++ b/src/thread.cc @@ -16,7 +16,6 @@ #include "thread.h" -#include <dynamic_annotations.h> #include <pthread.h> #include <signal.h> #include <sys/resource.h> diff --git a/src/utils.cc b/src/utils.cc index 50db7fa33a..145649524a 100644 --- a/src/utils.cc +++ b/src/utils.cc @@ -16,7 +16,6 @@ #include "utils.h" -#include <dynamic_annotations.h> #include <pthread.h> #include <sys/stat.h> #include <sys/syscall.h> @@ -933,8 +932,6 @@ bool EndsWith(const std::string& s, const char* suffix) { } void SetThreadName(const char* thread_name) { - ANNOTATE_THREAD_NAME(thread_name); // For tsan. - int hasAt = 0; int hasDot = 0; const char* s = thread_name; |