Move some remaining dex utilities
There were several utilities related to building/walking/testing dex
files that were not in libdexfile. This change consolidates these.
Bug: 22322814
Test: make -j 50 test-art-host
Change-Id: Id76e9179d03b8ec7d67f7e0f267121f54f0ec2e0
diff --git a/dex2oat/dex2oat_image_test.cc b/dex2oat/dex2oat_image_test.cc
index d895282..6f12249 100644
--- a/dex2oat/dex2oat_image_test.cc
+++ b/dex2oat/dex2oat_image_test.cc
@@ -33,8 +33,8 @@
#include "dex/art_dex_file_loader.h"
#include "dex/dex_file-inl.h"
#include "dex/dex_file_loader.h"
+#include "dex/method_reference.h"
#include "jit/profile_compilation_info.h"
-#include "method_reference.h"
#include "runtime.h"
namespace art {
diff --git a/dex2oat/dex2oat_test.cc b/dex2oat/dex2oat_test.cc
index 09ff14e..5590c8b 100644
--- a/dex2oat/dex2oat_test.cc
+++ b/dex2oat/dex2oat_test.cc
@@ -30,9 +30,9 @@
#include "base/macros.h"
#include "base/mutex-inl.h"
#include "base/utils.h"
-#include "bytecode_utils.h"
#include "dex/art_dex_file_loader.h"
#include "dex/base64_test_util.h"
+#include "dex/bytecode_utils.h"
#include "dex/code_item_accessors-inl.h"
#include "dex/dex_file-inl.h"
#include "dex/dex_file_loader.h"
diff --git a/dex2oat/linker/multi_oat_relative_patcher.h b/dex2oat/linker/multi_oat_relative_patcher.h
index 2413c6e..bd33b95 100644
--- a/dex2oat/linker/multi_oat_relative_patcher.h
+++ b/dex2oat/linker/multi_oat_relative_patcher.h
@@ -20,7 +20,7 @@
#include "arch/instruction_set.h"
#include "base/safe_map.h"
#include "debug/method_debug_info.h"
-#include "method_reference.h"
+#include "dex/method_reference.h"
#include "linker/relative_patcher.h"
namespace art {
diff --git a/dex2oat/linker/oat_writer.h b/dex2oat/linker/oat_writer.h
index 120ea56..7b7bd13 100644
--- a/dex2oat/linker/oat_writer.h
+++ b/dex2oat/linker/oat_writer.h
@@ -27,15 +27,15 @@
#include "base/os.h"
#include "base/safe_map.h"
#include "compiler.h"
-#include "dex/compact_dex_level.h"
#include "debug/debug_info.h"
+#include "dex/compact_dex_level.h"
+#include "dex/method_reference.h"
+#include "dex/string_reference.h"
+#include "dex/type_reference.h"
#include "linker/relative_patcher.h" // For RelativePatcherTargetProvider.
#include "mem_map.h"
-#include "method_reference.h"
#include "mirror/class.h"
#include "oat.h"
-#include "string_reference.h"
-#include "type_reference.h"
namespace art {
diff --git a/dex2oat/linker/oat_writer_test.cc b/dex2oat/linker/oat_writer_test.cc
index 6cd9013..6e95393 100644
--- a/dex2oat/linker/oat_writer_test.cc
+++ b/dex2oat/linker/oat_writer_test.cc
@@ -28,6 +28,7 @@
#include "debug/method_debug_info.h"
#include "dex/dex_file_loader.h"
#include "dex/quick_compiler_callbacks.h"
+#include "dex/test_dex_file_builder.h"
#include "dex/verification_results.h"
#include "driver/compiler_driver.h"
#include "driver/compiler_options.h"
@@ -45,7 +46,6 @@
#include "oat_file-inl.h"
#include "oat_writer.h"
#include "scoped_thread_state_change-inl.h"
-#include "utils/test_dex_file_builder.h"
#include "vdex_file.h"
namespace art {