Ahat: Use art -d in tests

Use the debug dependencies and art -d for heap-dump generation.
The heap dump already depends on the core images, which are
generated with dex2oatd. This cuts down on the required
targets when building ahat-tests.

Bug: 72549306
Test: m ahat-tests
Test: m test-art-host
Change-Id: I76d99b41d4d31b99a68f6085940ac0885c756905
diff --git a/tools/ahat/Android.mk b/tools/ahat/Android.mk
index 34e6a9c..bf79751 100644
--- a/tools/ahat/Android.mk
+++ b/tools/ahat/Android.mk
@@ -123,7 +123,7 @@
 # Run ahat-test-dump.jar to generate test-dump.hprof and test-dump-base.hprof
 AHAT_TEST_DUMP_DEPENDENCIES := \
   $(HOST_OUT_EXECUTABLES)/dalvikvm64 \
-  $(ART_HOST_SHARED_LIBRARY_DEPENDENCIES) \
+  $(ART_HOST_SHARED_LIBRARY_DEBUG_DEPENDENCIES) \
   $(HOST_OUT_EXECUTABLES)/art \
   $(HOST_CORE_IMG_OUT_BASE)$(CORE_IMG_SUFFIX)
 
@@ -134,7 +134,7 @@
 	rm -rf $(PRIVATE_AHAT_TEST_ANDROID_DATA)
 	mkdir -p $(PRIVATE_AHAT_TEST_ANDROID_DATA)
 	ANDROID_DATA=$(PRIVATE_AHAT_TEST_ANDROID_DATA) \
-	  $(PRIVATE_AHAT_TEST_ART) --64 -cp $(PRIVATE_AHAT_TEST_DUMP_JAR) Main $@
+	  $(PRIVATE_AHAT_TEST_ART) -d --64 -cp $(PRIVATE_AHAT_TEST_DUMP_JAR) Main $@
 
 $(AHAT_TEST_DUMP_BASE_HPROF): PRIVATE_AHAT_TEST_ART := $(HOST_OUT_EXECUTABLES)/art
 $(AHAT_TEST_DUMP_BASE_HPROF): PRIVATE_AHAT_TEST_DUMP_JAR := $(AHAT_TEST_DUMP_JAR)
@@ -143,7 +143,7 @@
 	rm -rf $(PRIVATE_AHAT_TEST_ANDROID_DATA)
 	mkdir -p $(PRIVATE_AHAT_TEST_ANDROID_DATA)
 	ANDROID_DATA=$(PRIVATE_AHAT_TEST_ANDROID_DATA) \
-	  $(PRIVATE_AHAT_TEST_ART) --64 -cp $(PRIVATE_AHAT_TEST_DUMP_JAR) Main $@ --base
+	  $(PRIVATE_AHAT_TEST_ART) -d --64 -cp $(PRIVATE_AHAT_TEST_DUMP_JAR) Main $@ --base
 
 # --- ahat-tests.jar --------------
 include $(CLEAR_VARS)