commit d98ff78976696fdde1e7868d4687719a0439544b
author Andreas Gampe <agampe@google.com> Fri Feb 20 21:19:05 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 20 21:19:05 2015 +0000
tree cc7bb22ffc9c15ff2ffc4586da2660a7286e75c6
parent a53cfc8d2e8fd61cea630f3a5f1dab701edcb53c
parent 8df91acfaf17d8fa0ce8c149d5ce445643b51018

Merge "ART: Add VALGRIND_LIB for gtests"

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 30d9886..c576d1b 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -328,6 +328,7 @@
 .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) $(ART_VALGRIND_DEPENDENCIES)
 	$(hide) $$(call ART_TEST_SKIP,$$@) && \
+	  VALGRIND_LIB=$(HOST_OUT)/lib64/valgrind \
 	  $(HOST_OUT_EXECUTABLES)/valgrind --leak-check=full --error-exitcode=1 $$< && \
 	    $$(call ART_TEST_PASSED,$$@) || $$(call ART_TEST_FAILED,$$@)