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/compiler/dex/dex_to_dex_compiler.cc b/compiler/dex/dex_to_dex_compiler.cc
index 0caf1b1..be8641f 100644
--- a/compiler/dex/dex_to_dex_compiler.cc
+++ b/compiler/dex/dex_to_dex_compiler.cc
@@ -24,8 +24,8 @@
#include "base/logging.h" // For VLOG
#include "base/macros.h"
#include "base/mutex.h"
-#include "bytecode_utils.h"
#include "compiled_method.h"
+#include "dex/bytecode_utils.h"
#include "dex/dex_file-inl.h"
#include "dex/dex_instruction-inl.h"
#include "dex_to_dex_decompiler.h"
diff --git a/compiler/dex/dex_to_dex_compiler.h b/compiler/dex/dex_to_dex_compiler.h
index 7df09f1..7536c31 100644
--- a/compiler/dex/dex_to_dex_compiler.h
+++ b/compiler/dex/dex_to_dex_compiler.h
@@ -24,8 +24,8 @@
#include "base/bit_vector.h"
#include "dex/dex_file.h"
#include "dex/invoke_type.h"
+#include "dex/method_reference.h"
#include "handle.h"
-#include "method_reference.h"
#include "quicken_info.h"
namespace art {
diff --git a/compiler/dex/inline_method_analyser.h b/compiler/dex/inline_method_analyser.h
index 837cc85..e1d652a 100644
--- a/compiler/dex/inline_method_analyser.h
+++ b/compiler/dex/inline_method_analyser.h
@@ -21,7 +21,7 @@
#include "base/mutex.h"
#include "dex/dex_file.h"
#include "dex/dex_instruction.h"
-#include "method_reference.h"
+#include "dex/method_reference.h"
/*
* NOTE: This code is part of the quick compiler. It lives in the runtime
diff --git a/compiler/dex/verification_results.h b/compiler/dex/verification_results.h
index 9e4192a..56f0030 100644
--- a/compiler/dex/verification_results.h
+++ b/compiler/dex/verification_results.h
@@ -24,8 +24,8 @@
#include "base/macros.h"
#include "base/mutex.h"
#include "base/safe_map.h"
-#include "class_reference.h"
-#include "method_reference.h"
+#include "dex/class_reference.h"
+#include "dex/method_reference.h"
#include "utils/atomic_dex_ref_map.h"
namespace art {
diff --git a/compiler/dex/verified_method.h b/compiler/dex/verified_method.h
index ecbeed3..f04392d 100644
--- a/compiler/dex/verified_method.h
+++ b/compiler/dex/verified_method.h
@@ -22,7 +22,7 @@
#include "base/mutex.h"
#include "base/safe_map.h"
#include "dex/dex_file.h"
-#include "method_reference.h"
+#include "dex/method_reference.h"
namespace art {