diff options
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | build/Android.gtest.mk | 5 | ||||
| -rwxr-xr-x | dexlist/Android.mk | 6 | ||||
| -rw-r--r-- | dexlist/dexlist.cc | 2 | ||||
| -rw-r--r-- | dexlist/dexlist_test.cc | 5 | ||||
| -rwxr-xr-x | test/dexdump/run-all-tests | 2 |
6 files changed, 9 insertions, 13 deletions
diff --git a/Android.mk b/Android.mk index 49b61bb221..b68383f52e 100644 --- a/Android.mk +++ b/Android.mk @@ -240,7 +240,7 @@ endif # Dexdump/list regression test. .PHONY: test-art-host-dexdump -test-art-host-dexdump: $(addprefix $(HOST_OUT_EXECUTABLES)/, dexdump2 dexlist2) +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. diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 63ad9cf3ff..1272967625 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -105,15 +105,14 @@ ART_GTEST_dexdump_test_TARGET_DEPS := \ 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 diff --git a/dexlist/Android.mk b/dexlist/Android.mk index 9fbd8470b8..6ec6c97dce 100755 --- a/dexlist/Android.mk +++ b/dexlist/Android.mk @@ -14,8 +14,6 @@ # TODO(ajcbik): Art-i-fy this makefile -# TODO(ajcbik): rename dexlist2 into dexlist when Dalvik version is removed - LOCAL_PATH:= $(call my-dir) dexlist_src_files := dexlist.cc @@ -33,7 +31,7 @@ LOCAL_SRC_FILES := $(dexlist_src_files) LOCAL_C_INCLUDES := $(dexlist_c_includes) LOCAL_CFLAGS += -Wall LOCAL_SHARED_LIBRARIES += $(dexlist_libraries) -LOCAL_MODULE := dexlist2 +LOCAL_MODULE := dexlist LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) include $(BUILD_EXECUTABLE) @@ -49,6 +47,6 @@ LOCAL_SRC_FILES := $(dexlist_src_files) LOCAL_C_INCLUDES := $(dexlist_c_includes) LOCAL_CFLAGS += -Wall LOCAL_SHARED_LIBRARIES += $(dexlist_libraries) -LOCAL_MODULE := dexlist2 +LOCAL_MODULE := dexlist LOCAL_MULTILIB := $(ART_MULTILIB_OVERRIDE_host) include $(BUILD_HOST_EXECUTABLE) diff --git a/dexlist/dexlist.cc b/dexlist/dexlist.cc index d8fd242024..1d0f75ea92 100644 --- a/dexlist/dexlist.cc +++ b/dexlist/dexlist.cc @@ -235,7 +235,7 @@ int dexlistDriver(int argc, char** argv) { gOptions.outputFileName = optarg; break; case 'm': - // If -m x.y.z is given, then find all instances of the + // If -m p.c.m is given, then find all instances of the // fully-qualified method name. This isn't really what // dexlist is for, but it's easy to do it here. { diff --git a/dexlist/dexlist_test.cc b/dexlist/dexlist_test.cc index 7b1b63dba7..82179dea95 100644 --- a/dexlist/dexlist_test.cc +++ b/dexlist/dexlist_test.cc @@ -42,12 +42,11 @@ class DexListTest : public CommonRuntimeTest { // Runs test with given arguments. bool Exec(const std::vector<std::string>& args, std::string* error_msg) { - // TODO(ajcbik): dexlist2 -> dexlist std::string file_path = GetTestAndroidRoot(); if (IsHost()) { - file_path += "/bin/dexlist2"; + file_path += "/bin/dexlist"; } else { - file_path += "/xbin/dexlist2"; + file_path += "/xbin/dexlist"; } EXPECT_TRUE(OS::FileExists(file_path.c_str())) << file_path << " should be a valid file path"; std::vector<std::string> exec_argv = { file_path }; diff --git a/test/dexdump/run-all-tests b/test/dexdump/run-all-tests index d9f1e9649d..9cf7ab6cea 100755 --- a/test/dexdump/run-all-tests +++ b/test/dexdump/run-all-tests @@ -43,7 +43,7 @@ DEXDFLAGS1="-dfh" DEXDFLAGS2="-l xml" # Set up dexlist binary and flags to test. -DEXL="${ANDROID_HOST_OUT}/bin/dexlist2" +DEXL="${ANDROID_HOST_OUT}/bin/dexlist" DEXLFLAGS="" # Run the tests. |