Compiler: rearranging the deck chairs.
First of several steps to adopt the new source directory layout. No
logic changes - just moved files around.
Change-Id: I087631f8aa23973e18da4dc7706249c490bee061
diff --git a/src/compiler_llvm/gbc_expander.cc b/src/compiler_llvm/gbc_expander.cc
index f5d6e8c..3ed8cba 100644
--- a/src/compiler_llvm/gbc_expander.cc
+++ b/src/compiler_llvm/gbc_expander.cc
@@ -25,8 +25,8 @@
#include "thread.h"
#include "verifier/method_verifier.h"
-#include "compiler/compiler_ir.h"
-#include "compiler/codegen/codegen.h"
+#include "compiler/dex/compiler_ir.h"
+#include "compiler/dex/quick/codegen.h"
using art::kMIRIgnoreNullCheck;
using art::kMIRIgnoreRangeCheck;
diff --git a/src/compiler_llvm/llvm_compilation_unit.h b/src/compiler_llvm/llvm_compilation_unit.h
index 8cc3db7..5951061 100644
--- a/src/compiler_llvm/llvm_compilation_unit.h
+++ b/src/compiler_llvm/llvm_compilation_unit.h
@@ -19,7 +19,7 @@
#include "base/logging.h"
#include "base/mutex.h"
-#include "compiler/compiler_internals.h"
+#include "compiler/dex/compiler_internals.h"
#include "compiler.h"
#include "globals.h"
#include "instruction_set.h"
@@ -28,7 +28,6 @@
#include "runtime_support_func.h"
#include "safe_map.h"
-
#include <UniquePtr.h>
#include <string>
#include <vector>