commit 22c26f5b454b56a20215cb8bbc5e8afcaccafdb0
author Aart Bik <ajcbik@google.com> Wed Jul 08 21:20:13 2015 +0000
committer Aart Bik <ajcbik@google.com> Wed Jul 08 21:20:13 2015 +0000
tree 25e224c087f006e75983a6f7fdcf55ee53797861
parent d10ee1ce1ccd92c003ec49c15edf339e74c13894

Revert "Make Art dexdump/list the real utilities."

This reverts commit d10ee1ce1ccd92c003ec49c15edf339e74c13894.


REASON:
win_sdk is not happy with my migration :-(

Change-Id: I2ed196da3f5883112883525f883d25b36e48352a

dexdump/Android.mk

diff --git a/dexdump/Android.mk b/dexdump/Android.mk
index 7d3488f..c6b4d47 100755
--- a/dexdump/Android.mk
+++ b/dexdump/Android.mk
@@ -14,6 +14,8 @@
 
 # TODO(ajcbik): Art-i-fy this makefile
 
+# TODO(ajcbik): rename dexdump2 into dexdump when Dalvik version is removed
+
 LOCAL_PATH:= $(call my-dir)
 
 dexdump_src_files := dexdump_main.cc dexdump.cc
@@ -31,7 +33,7 @@
 LOCAL_C_INCLUDES := $(dexdump_c_includes)
 LOCAL_CFLAGS += -Wall
 LOCAL_SHARED_LIBRARIES += $(dexdump_libraries)
-LOCAL_MODULE := dexdump
+LOCAL_MODULE := dexdump2
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
 include $(BUILD_EXECUTABLE)
@@ -47,6 +49,6 @@
 LOCAL_C_INCLUDES := $(dexdump_c_includes)
 LOCAL_CFLAGS += -Wall
 LOCAL_SHARED_LIBRARIES += $(dexdump_libraries)
-LOCAL_MODULE := dexdump
+LOCAL_MODULE := dexdump2
 LOCAL_MODULE_TAGS := optional
 include $(BUILD_HOST_EXECUTABLE)

dexdump/dexdump.cc

diff --git a/dexdump/dexdump.cc b/dexdump/dexdump.cc
index d26b8b5..f55dccd 100644
--- a/dexdump/dexdump.cc
+++ b/dexdump/dexdump.cc
@@ -52,7 +52,7 @@
 struct Options gOptions;
 
 /*
- * Output file. Defaults to stdout.
+ * Output file. Defaults to stdout, but tests can modify.
  */
 FILE* gOutFile = stdout;
 
@@ -63,6 +63,8 @@
 typedef uint16_t u2;
 typedef uint32_t u4;
 typedef uint64_t u8;
+typedef int8_t   s1;
+typedef int16_t  s2;
 typedef int32_t  s4;
 typedef int64_t  s8;
 

dexdump/dexdump_main.cc

diff --git a/dexdump/dexdump_main.cc b/dexdump/dexdump_main.cc
index 9be0922..756f879 100644
--- a/dexdump/dexdump_main.cc
+++ b/dexdump/dexdump_main.cc
@@ -108,8 +108,8 @@
       default:
         wantUsage = true;
         break;
-    }  // switch
-  }  // while
+    }
+  }
 
   // Detect early problems.
   if (optind == argc) {
@@ -138,7 +138,7 @@
   int result = 0;
   while (optind < argc) {
     result |= processFile(argv[optind++]);
-  }  // while
+  }
   return result != 0;
 }
 

dexdump/dexdump_test.cc

diff --git a/dexdump/dexdump_test.cc b/dexdump/dexdump_test.cc
index 9ae5d20..d9b210d 100644
--- a/dexdump/dexdump_test.cc
+++ b/dexdump/dexdump_test.cc
@@ -42,11 +42,12 @@
 
   // 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();
     if (IsHost()) {
-      file_path += "/bin/dexdump";
+      file_path += "/bin/dexdump2";
     } else {
-      file_path += "/xbin/dexdump";
+      file_path += "/xbin/dexdump2";
     }
     EXPECT_TRUE(OS::FileExists(file_path.c_str())) << file_path << " should be a valid file path";
     std::vector<std::string> exec_argv = { file_path };