Clean up the valgrind test targets.
Allow the 32-bit or the 64-bit valgrind tests to run separately or both.
Bug: 27156726
Change-Id: Ib439eb2f57d3302be152cb5af1a8960a41725f31
diff --git a/Android.mk b/Android.mk
index e762814..e89f617 100644
--- a/Android.mk
+++ b/Android.mk
@@ -270,11 +270,19 @@
test-art-host-dexdump: $(addprefix $(HOST_OUT_EXECUTABLES)/, dexdump2 dexlist)
ANDROID_HOST_OUT=$(realpath $(HOST_OUT)) art/test/dexdump/run-all-tests
-# Valgrind. Currently only 32b gtests.
+# Valgrind. Currently only 32b gtests. TODO: change this from 32-bit only to both 32-bit and 64-bit.
.PHONY: valgrind-test-art-host
valgrind-test-art-host: valgrind-test-art-host-gtest32
$(hide) $(call ART_TEST_PREREQ_FINISHED,$@)
+.PHONY: valgrind-test-art-host32
+valgrind-test-art-host32: valgrind-test-art-host-gtest32
+ $(hide) $(call ART_TEST_PREREQ_FINISHED,$@)
+
+.PHONY: valgrind-test-art-host64
+valgrind-test-art-host64: valgrind-test-art-host-gtest64
+ $(hide) $(call ART_TEST_PREREQ_FINISHED,$@)
+
########################################################################
# target test rules