ART: Add VALGRIND_LIB for gtests

Ensure that tests can be run without lunch-ing a target.

Change-Id: If9b4a6c56952418fde703145600717c84e11ef99

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 30d9886..c576d1b 100644 (file)
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -328,6 +328,7 @@ $$(gtest_rule): $$(gtest_exe) $$(ART_GTEST_$(1)_HOST_DEPS) $(foreach file,$(ART_
 .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,$$@)