diff options
author | Aart Bik <ajcbik@google.com> | 2015-07-08 21:20:13 +0000 |
---|---|---|
committer | Aart Bik <ajcbik@google.com> | 2015-07-08 21:20:13 +0000 |
commit | 22c26f5b454b56a20215cb8bbc5e8afcaccafdb0 (patch) | |
tree | 25e224c087f006e75983a6f7fdcf55ee53797861 | |
parent | d10ee1ce1ccd92c003ec49c15edf339e74c13894 (diff) | |
download | android_art-22c26f5b454b56a20215cb8bbc5e8afcaccafdb0.tar.gz android_art-22c26f5b454b56a20215cb8bbc5e8afcaccafdb0.tar.bz2 android_art-22c26f5b454b56a20215cb8bbc5e8afcaccafdb0.zip |
Revert "Make Art dexdump/list the real utilities."
This reverts commit d10ee1ce1ccd92c003ec49c15edf339e74c13894.
REASON:
win_sdk is not happy with my migration :-(
Change-Id: I2ed196da3f5883112883525f883d25b36e48352a
-rw-r--r-- | Android.mk | 2 | ||||
-rw-r--r-- | build/Android.gtest.mk | 10 | ||||
-rwxr-xr-x | dexdump/Android.mk | 6 | ||||
-rw-r--r-- | dexdump/dexdump.cc | 4 | ||||
-rw-r--r-- | dexdump/dexdump_main.cc | 6 | ||||
-rw-r--r-- | dexdump/dexdump_test.cc | 5 | ||||
-rwxr-xr-x | dexlist/Android.mk | 6 | ||||
-rw-r--r-- | dexlist/dexlist.cc | 5 | ||||
-rw-r--r-- | dexlist/dexlist_test.cc | 5 | ||||
-rwxr-xr-x | test/dexdump/run-all-tests | 4 |
10 files changed, 33 insertions, 20 deletions
diff --git a/Android.mk b/Android.mk index b04c6327d7..ff39d5328e 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: dexdump dexlist +test-art-host-dexdump: dexdump2 dexlist2 art/test/dexdump/run-all-tests # Valgrind. Currently only 32b gtests. diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index ccf6d767ad..0958c645d8 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -94,24 +94,26 @@ ART_GTEST_oat_file_assistant_test_TARGET_DEPS := \ ART_GTEST_proxy_test_HOST_DEPS := $(HOST_CORE_IMAGE_default_no-pic_64) $(HOST_CORE_IMAGE_default_no-pic_32) # The dexdump test requires an image and the dexdump utility. +# TODO: rename into dexdump when migration completes ART_GTEST_dexdump_test_HOST_DEPS := \ $(HOST_CORE_IMAGE_default_no-pic_64) \ $(HOST_CORE_IMAGE_default_no-pic_32) \ - $(HOST_OUT_EXECUTABLES)/dexdump + $(HOST_OUT_EXECUTABLES)/dexdump2 ART_GTEST_dexdump_test_TARGET_DEPS := \ $(TARGET_CORE_IMAGE_default_no-pic_64) \ $(TARGET_CORE_IMAGE_default_no-pic_32) \ - dexdump + 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)/dexlist + $(HOST_OUT_EXECUTABLES)/dexlist2 ART_GTEST_dexlist_test_TARGET_DEPS := \ $(TARGET_CORE_IMAGE_default_no-pic_64) \ $(TARGET_CORE_IMAGE_default_no-pic_32) \ - dexlist + dexlist2 # 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/dexdump/Android.mk b/dexdump/Android.mk index 7d3488f4a0..c6b4d47f6d 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_SRC_FILES := $(dexdump_src_files) 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_SRC_FILES := $(dexdump_src_files) 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) diff --git a/dexdump/dexdump.cc b/dexdump/dexdump.cc index d26b8b5ac8..f55dccd069 100644 --- a/dexdump/dexdump.cc +++ b/dexdump/dexdump.cc @@ -52,7 +52,7 @@ namespace art { 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 uint8_t u1; 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; diff --git a/dexdump/dexdump_main.cc b/dexdump/dexdump_main.cc index 9be0922877..756f8793c9 100644 --- a/dexdump/dexdump_main.cc +++ b/dexdump/dexdump_main.cc @@ -108,8 +108,8 @@ int dexdumpDriver(int argc, char** argv) { default: wantUsage = true; break; - } // switch - } // while + } + } // Detect early problems. if (optind == argc) { @@ -138,7 +138,7 @@ int dexdumpDriver(int argc, char** argv) { int result = 0; while (optind < argc) { result |= processFile(argv[optind++]); - } // while + } return result != 0; } diff --git a/dexdump/dexdump_test.cc b/dexdump/dexdump_test.cc index 9ae5d20b06..d9b210d767 100644 --- a/dexdump/dexdump_test.cc +++ b/dexdump/dexdump_test.cc @@ -42,11 +42,12 @@ 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(); 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 }; diff --git a/dexlist/Android.mk b/dexlist/Android.mk index 037ac0e6c7..988fe03b0c 100755 --- a/dexlist/Android.mk +++ b/dexlist/Android.mk @@ -14,6 +14,8 @@ # 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 @@ -31,7 +33,7 @@ LOCAL_SRC_FILES := $(dexlist_src_files) LOCAL_C_INCLUDES := $(dexlist_c_includes) LOCAL_CFLAGS += -Wall LOCAL_SHARED_LIBRARIES += $(dexlist_libraries) -LOCAL_MODULE := dexlist +LOCAL_MODULE := dexlist2 LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) include $(BUILD_EXECUTABLE) @@ -47,6 +49,6 @@ LOCAL_SRC_FILES := $(dexlist_src_files) LOCAL_C_INCLUDES := $(dexlist_c_includes) LOCAL_CFLAGS += -Wall LOCAL_SHARED_LIBRARIES += $(dexlist_libraries) -LOCAL_MODULE := dexlist +LOCAL_MODULE := dexlist2 LOCAL_MODULE_TAGS := optional include $(BUILD_HOST_EXECUTABLE) diff --git a/dexlist/dexlist.cc b/dexlist/dexlist.cc index c611fbd86f..d7c0e4cfc2 100644 --- a/dexlist/dexlist.cc +++ b/dexlist/dexlist.cc @@ -51,8 +51,11 @@ static FILE* gOutFile = stdout; * Data types that match the definitions in the VM specification. */ typedef uint8_t u1; +typedef uint16_t u2; typedef uint32_t u4; typedef uint64_t u8; +typedef int32_t s4; +typedef int64_t s8; /* * Returns a newly-allocated string for the "dot version" of the class @@ -243,7 +246,7 @@ int dexlistDriver(int argc, char** argv) { gOptions.outputFileName = optarg; break; case 'm': - // If -m p.c.m is given, then find all instances of the + // If -m X.Y.Z 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 82179dea95..7b1b63dba7 100644 --- a/dexlist/dexlist_test.cc +++ b/dexlist/dexlist_test.cc @@ -42,11 +42,12 @@ 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/dexlist"; + file_path += "/bin/dexlist2"; } else { - file_path += "/xbin/dexlist"; + file_path += "/xbin/dexlist2"; } 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 c0fbb1da05..d9f1e9649d 100755 --- a/test/dexdump/run-all-tests +++ b/test/dexdump/run-all-tests @@ -38,12 +38,12 @@ tmpdir=/tmp/test-$$ mkdir ${tmpdir} # Set up dexdump binary and flags to test. -DEXD="${ANDROID_HOST_OUT}/bin/dexdump" +DEXD="${ANDROID_HOST_OUT}/bin/dexdump2" DEXDFLAGS1="-dfh" DEXDFLAGS2="-l xml" # Set up dexlist binary and flags to test. -DEXL="${ANDROID_HOST_OUT}/bin/dexlist" +DEXL="${ANDROID_HOST_OUT}/bin/dexlist2" DEXLFLAGS="" # Run the tests. |