Make Art's dexlist the real one!
Renaming dexlist2 into dexlist now that Dalvik's dexlist
is gone. Unless dexdump, this migration is straightforward
since the windows SDK does not ship dexlist.
Bug: 22322814
Change-Id: I721a72abdd9a17329b53020274495323467e388e
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 63ad9cf..1272967 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -105,15 +105,14 @@
dexdump2
# The dexlist test requires an image and the dexlist utility.
-# TODO: rename into dexlist when migration completes
ART_GTEST_dexlist_test_HOST_DEPS := \
$(HOST_CORE_IMAGE_default_no-pic_64) \
$(HOST_CORE_IMAGE_default_no-pic_32) \
- $(HOST_OUT_EXECUTABLES)/dexlist2
+ $(HOST_OUT_EXECUTABLES)/dexlist
ART_GTEST_dexlist_test_TARGET_DEPS := \
$(TARGET_CORE_IMAGE_default_no-pic_64) \
$(TARGET_CORE_IMAGE_default_no-pic_32) \
- dexlist2
+ dexlist
# The imgdiag test has dependencies on core.oat since it needs to load it during the test.
# For the host, also add the installed tool (in the base size, that should suffice). For the