ART: Use Valgrind from tree
Change-Id: I3e70c37cc04e0a2286e6fece898fcf887273b28c
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 5966951..30d9886 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -294,6 +294,16 @@
gtest_rule :=
endef # define-art-gtest-rule-target
+ART_VALGRIND_DEPENDENCIES := \
+ $(HOST_OUT_EXECUTABLES)/valgrind \
+ $(HOST_OUT)/lib64/valgrind/memcheck-amd64-linux \
+ $(HOST_OUT)/lib64/valgrind/memcheck-x86-linux \
+ $(HOST_OUT)/lib64/valgrind/default.supp \
+ $(HOST_OUT)/lib64/valgrind/vgpreload_core-amd64-linux.so \
+ $(HOST_OUT)/lib64/valgrind/vgpreload_core-x86-linux.so \
+ $(HOST_OUT)/lib64/valgrind/vgpreload_memcheck-amd64-linux.so \
+ $(HOST_OUT)/lib64/valgrind/vgpreload_memcheck-x86-linux.so
+
# Define make rules for a host gtests.
# $(1): gtest name - the name of the test we're building such as leb128_test.
# $(2): 2ND_ or undefined - used to differentiate between the primary and secondary architecture.
@@ -314,11 +324,12 @@
ART_TEST_HOST_GTEST_RULES += $$(gtest_rule)
ART_TEST_HOST_GTEST_$(1)_RULES += $$(gtest_rule)
+
.PHONY: valgrind-$$(gtest_rule)
-valgrind-$$(gtest_rule): $$(gtest_exe) $$(ART_GTEST_$(1)_HOST_DEPS) $(foreach file,$(ART_GTEST_$(1)_DEX_DEPS),$(ART_TEST_HOST_GTEST_$(file)_DEX)) $$(gtest_deps)
+valgrind-$$(gtest_rule): $$(gtest_exe) $$(ART_GTEST_$(1)_HOST_DEPS) $(foreach file,$(ART_GTEST_$(1)_DEX_DEPS),$(ART_TEST_HOST_GTEST_$(file)_DEX)) $$(gtest_deps) $(ART_VALGRIND_DEPENDENCIES)
$(hide) $$(call ART_TEST_SKIP,$$@) && \
- valgrind --leak-check=full --error-exitcode=1 $$< && $$(call ART_TEST_PASSED,$$@) \
- || $$(call ART_TEST_FAILED,$$@)
+ $(HOST_OUT_EXECUTABLES)/valgrind --leak-check=full --error-exitcode=1 $$< && \
+ $$(call ART_TEST_PASSED,$$@) || $$(call ART_TEST_FAILED,$$@)
ART_TEST_HOST_VALGRIND_GTEST$$($(2)ART_PHONY_TEST_HOST_SUFFIX)_RULES += valgrind-$$(gtest_rule)
ART_TEST_HOST_VALGRIND_GTEST_RULES += valgrind-$$(gtest_rule)
@@ -551,6 +562,7 @@
ART_GTEST_reflection_test_DEX_DEPS :=
ART_GTEST_stub_test_DEX_DEPS :=
ART_GTEST_transaction_test_DEX_DEPS :=
+ART_VALGRIND_DEPENDENCIES :=
$(foreach dir,$(GTEST_DEX_DIRECTORIES), $(eval ART_TEST_TARGET_GTEST_$(dir)_DEX :=))
$(foreach dir,$(GTEST_DEX_DIRECTORIES), $(eval ART_TEST_HOST_GTEST_$(dir)_DEX :=))
GTEST_DEX_DIRECTORIES :=