ART: Fix test dependencies and code
Let profman target test correctly depend on profmand.
Create a debug version of dexlayout to be used in dexlayout_test.
Fix a bug in ProfileCompilationInfo referring to a nonexisting
element.
Test: m test-art-host
Change-Id: If2220f26c37c25a600399b2637f081c62cae9718
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 454caa9..42d0ba5 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -208,12 +208,12 @@
ART_GTEST_dexlayout_test_HOST_DEPS := \
$(HOST_CORE_IMAGE_DEFAULT_64) \
$(HOST_CORE_IMAGE_DEFAULT_32) \
- dexlayout-host \
+ dexlayoutd-host \
dexdump2-host
ART_GTEST_dexlayout_test_TARGET_DEPS := \
$(TARGET_CORE_IMAGE_DEFAULT_64) \
$(TARGET_CORE_IMAGE_DEFAULT_32) \
- dexlayout-target \
+ dexlayoutd-target \
dexdump2-target
# The dexlist test requires an image and the dexlist utility.
@@ -253,7 +253,7 @@
# Profile assistant tests requires profman utility.
ART_GTEST_profile_assistant_test_HOST_DEPS := profmand-host
-ART_GTEST_profile_assistant_test_TARGET_DEPS := profman-target
+ART_GTEST_profile_assistant_test_TARGET_DEPS := profmand-target
# The path for which all the source files are relative, not actually the current directory.
LOCAL_PATH := art