Rename dexdump2 to dexdump

Complete the migration from dalvik/dexdump to art/dexdump.

Bug: 22322814
Test: make checkbuild test-art-host-dexdump
Change-Id: I95d5b83d9855b440f2fe4073f1e1d746fe807888

7 files changed, 40 insertions, 41 deletions

diff --git a/Android.mk b/Android.mk
index bebe759670..2b32c820d3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -241,7 +241,7 @@ endif
 
 # Dexdump/list regression test.
 .PHONY: test-art-host-dexdump
-test-art-host-dexdump: $(addprefix $(HOST_OUT_EXECUTABLES)/, dexdump2 dexlist)
+test-art-host-dexdump: $(addprefix $(HOST_OUT_EXECUTABLES)/, dexdump dexlist)
 	ANDROID_HOST_OUT=$(realpath $(HOST_OUT)) art/test/dexdump/run-all-tests
 
 ########################################################################
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 74b77071c3..b1e97d9b83 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -288,11 +288,11 @@ ART_GTEST_dexdiag_test_TARGET_DEPS := $(TARGET_OUT_EXECUTABLES)/dexdiag
 ART_GTEST_dexdump_test_HOST_DEPS := \
   $(HOST_CORE_IMAGE_DEFAULT_64) \
   $(HOST_CORE_IMAGE_DEFAULT_32) \
-  $(HOST_OUT_EXECUTABLES)/dexdump2
+  $(HOST_OUT_EXECUTABLES)/dexdump
 ART_GTEST_dexdump_test_TARGET_DEPS := \
   $(TARGET_CORE_IMAGE_DEFAULT_64) \
   $(TARGET_CORE_IMAGE_DEFAULT_32) \
-  $(TARGET_OUT_EXECUTABLES)/dexdump2
+  $(TARGET_OUT_EXECUTABLES)/dexdump
 
 # The dexanalyze test requires an image and the dexanalyze utility.
 ART_GTEST_dexanalyze_test_HOST_DEPS := \
@@ -310,12 +310,12 @@ ART_GTEST_dexlayout_test_HOST_DEPS := \
   $(HOST_CORE_IMAGE_DEFAULT_64) \
   $(HOST_CORE_IMAGE_DEFAULT_32) \
   $(HOST_OUT_EXECUTABLES)/dexlayoutd \
-  $(HOST_OUT_EXECUTABLES)/dexdump2
+  $(HOST_OUT_EXECUTABLES)/dexdump
 ART_GTEST_dexlayout_test_TARGET_DEPS := \
   $(TARGET_CORE_IMAGE_DEFAULT_64) \
   $(TARGET_CORE_IMAGE_DEFAULT_32) \
   $(TARGET_OUT_EXECUTABLES)/dexlayoutd \
-  $(TARGET_OUT_EXECUTABLES)/dexdump2
+  $(TARGET_OUT_EXECUTABLES)/dexdump
 
 # The dexlist test requires an image and the dexlist utility.
 ART_GTEST_dexlist_test_HOST_DEPS := \
@@ -351,12 +351,12 @@ ART_GTEST_oatdump_test_HOST_DEPS := \
   $(HOST_CORE_IMAGE_DEFAULT_32) \
   $(HOST_OUT_EXECUTABLES)/oatdumpd \
   $(HOST_OUT_EXECUTABLES)/oatdumpds \
-  $(HOST_OUT_EXECUTABLES)/dexdump2
+  $(HOST_OUT_EXECUTABLES)/dexdump
 ART_GTEST_oatdump_test_TARGET_DEPS := \
   $(TARGET_CORE_IMAGE_DEFAULT_64) \
   $(TARGET_CORE_IMAGE_DEFAULT_32) \
   $(TARGET_OUT_EXECUTABLES)/oatdumpd \
-  $(TARGET_OUT_EXECUTABLES)/dexdump2
+  $(TARGET_OUT_EXECUTABLES)/dexdump
 ART_GTEST_oatdump_image_test_HOST_DEPS := $(ART_GTEST_oatdump_test_HOST_DEPS)
 ART_GTEST_oatdump_image_test_TARGET_DEPS := $(ART_GTEST_oatdump_test_TARGET_DEPS)
 ART_GTEST_oatdump_app_test_HOST_DEPS := $(ART_GTEST_oatdump_test_HOST_DEPS) \
diff --git a/dexdump/Android.bp b/dexdump/Android.bp
index 434cb3553f..10bdf5182b 100644
--- a/dexdump/Android.bp
+++ b/dexdump/Android.bp
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// TODO(ajcbik): rename dexdump2 into dexdump when Dalvik version is removed
-
-
 cc_defaults {
     name: "dexdump_defaults",
     defaults: ["art_defaults"],
@@ -26,33 +23,37 @@ cc_defaults {
 }
 
 art_cc_binary {
-    name: "dexdump2",
+    name: "dexdump",
     defaults: ["dexdump_defaults"],
     host_supported: true,
-    shared_libs: [
-        "libdexfile",
-        "libartbase",
-        "libbase",
-    ],
-}
-
-art_cc_binary {
-    name: "dexdumps",
-    defaults: [
-        "dexdump_defaults",
-        "libartbase_static_defaults",
-        "libdexfile_static_defaults",
-    ],
-    host_supported: true,
-    device_supported: false,
     target: {
-        darwin: {
-            enabled: false,
-        },
         windows: {
             enabled: true,
-        },
-    },
+            static_libs: [
+                "libdexfile",
+                "libartbase",
+                "libbase",
+                "libartpalette",
+                "liblog",
+                "libz",
+                "libziparchive",
+            ],
+	},
+	not_windows: {
+            shared_libs: [
+                "libdexfile",
+                "libartbase",
+                "libbase",
+            ],
+	},
+	android: {
+            shared_libs: [
+                "libdexfile",
+                "libartbase",
+                "libbase",
+            ],
+	},
+    }
 }
 
 art_cc_test {
diff --git a/dexdump/dexdump_test.cc b/dexdump/dexdump_test.cc
index bb6d4a4b9b..a0f5335409 100644
--- a/dexdump/dexdump_test.cc
+++ b/dexdump/dexdump_test.cc
@@ -39,8 +39,7 @@ class DexDumpTest : public CommonRuntimeTest {
 
   // Runs test with given arguments.
   bool Exec(const std::vector<std::string>& args, std::string* error_msg) {
-    // TODO(ajcbik): dexdump2 -> dexdump
-    std::string file_path = GetTestAndroidRoot() + "/bin/dexdump2";
+    std::string file_path = GetTestAndroidRoot() + "/bin/dexdump";
     EXPECT_TRUE(OS::FileExists(file_path.c_str())) << file_path << " should be a valid file path";
     std::vector<std::string> exec_argv = { file_path };
     exec_argv.insert(exec_argv.end(), args.begin(), args.end());
diff --git a/dexlayout/dexlayout_test.cc b/dexlayout/dexlayout_test.cc
index b68449ebbe..3124cf6bb8 100644
--- a/dexlayout/dexlayout_test.cc
+++ b/dexlayout/dexlayout_test.cc
@@ -258,10 +258,9 @@ class DexLayoutTest : public CommonRuntimeTest {
 
   // Runs FullPlainOutput test.
   bool FullPlainOutputExec(std::string* error_msg) {
-    // TODO: dexdump2 -> dexdump ?
     ScratchFile dexdump_output;
     const std::string& dexdump_filename = dexdump_output.GetFilename();
-    std::string dexdump = GetTestAndroidRoot() + "/bin/dexdump2";
+    std::string dexdump = GetTestAndroidRoot() + "/bin/dexdump";
     EXPECT_TRUE(OS::FileExists(dexdump.c_str())) << dexdump << " should be a valid file path";
 
     ScratchFile dexlayout_output;
diff --git a/oatdump/oatdump_test.cc b/oatdump/oatdump_test.cc
index 8505b0c57b..506fde776b 100644
--- a/oatdump/oatdump_test.cc
+++ b/oatdump/oatdump_test.cc
@@ -97,12 +97,12 @@ TEST_F(OatDumpTest, TestExportDex) {
   const std::string dex_location =
       tmp_dir_+ "/" + android::base::Basename(GetTestDexFileName(GetAppBaseName().c_str())) +
       "_export.dex";
-  const std::string dexdump2 = GetExecutableFilePath("dexdump2",
-                                                     /*is_debug=*/false,
-                                                     /*is_static=*/false);
+  const std::string dexdump = GetExecutableFilePath("dexdump",
+                                                    /*is_debug=*/false,
+                                                    /*is_static=*/false);
   std::string output;
   auto post_fork_fn = []() { return true; };
-  ForkAndExecResult res = ForkAndExec({dexdump2, "-d", dex_location}, post_fork_fn, &output);
+  ForkAndExecResult res = ForkAndExec({dexdump, "-d", dex_location}, post_fork_fn, &output);
   ASSERT_TRUE(res.StandardSuccess());
 }
 TEST_F(OatDumpTest, TestExportDexStatic) {
diff --git a/test/dexdump/run-all-tests b/test/dexdump/run-all-tests
index e555a44e5d..2fe4a02a13 100755
--- a/test/dexdump/run-all-tests
+++ b/test/dexdump/run-all-tests
@@ -38,7 +38,7 @@ tmpdir=/tmp/test-$$
 mkdir ${tmpdir}
 
 # Set up tools and commands to run
-DEXDUMP="${ANDROID_HOST_OUT}/bin/dexdump2"
+DEXDUMP="${ANDROID_HOST_OUT}/bin/dexdump"
 DEXLIST="${ANDROID_HOST_OUT}/bin/dexlist"
 
 declare -A SUFFIX_COMMAND_MAP