Rename compiler_llvm CompilationUnit to LlvmCompilationUnit
Also fixed stray ART_TEST_CFLAGS to LOCAL_CFLAGS
Also fixed relative includes
Tried to change CompilationUnit to reference LlvmCompilationUnit, but
that causes issues because of the split libart-compiler
libart-compiler-llvm.
Change-Id: I7a490f339add6355a20c1cedae858ccf6967a6aa
diff --git a/src/compiler/codegen/x86/assemble_x86.cc b/src/compiler/codegen/x86/assemble_x86.cc
index 2b33090..1fa2352 100644
--- a/src/compiler/codegen/x86/assemble_x86.cc
+++ b/src/compiler/codegen/x86/assemble_x86.cc
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#include "x86_lir.h"
#include "codegen_x86.h"
-#include "../codegen_util.h"
+#include "compiler/codegen/codegen_util.h"
+#include "x86_lir.h"
namespace art {
diff --git a/src/compiler/codegen/x86/call_x86.cc b/src/compiler/codegen/x86/call_x86.cc
index f9b25c8..4209375 100644
--- a/src/compiler/codegen/x86/call_x86.cc
+++ b/src/compiler/codegen/x86/call_x86.cc
@@ -16,10 +16,10 @@
/* This file contains codegen for the X86 ISA */
-#include "x86_lir.h"
#include "codegen_x86.h"
-#include "../codegen_util.h"
-#include "../ralloc_util.h"
+#include "compiler/codegen/codegen_util.h"
+#include "compiler/codegen/ralloc_util.h"
+#include "x86_lir.h"
namespace art {
diff --git a/src/compiler/codegen/x86/codegen_x86.h b/src/compiler/codegen/x86/codegen_x86.h
index 25f4461..141638c 100644
--- a/src/compiler/codegen/x86/codegen_x86.h
+++ b/src/compiler/codegen/x86/codegen_x86.h
@@ -17,7 +17,7 @@
#ifndef ART_SRC_COMPILER_CODEGEN_X86_CODEGENX86_H_
#define ART_SRC_COMPILER_CODEGEN_X86_CODEGENX86_H_
-#include "../../compiler_internals.h"
+#include "compiler/compiler_internals.h"
#include "x86_lir.h"
namespace art {
diff --git a/src/compiler/codegen/x86/fp_x86.cc b/src/compiler/codegen/x86/fp_x86.cc
index 6bfe9a2..00c2f53 100644
--- a/src/compiler/codegen/x86/fp_x86.cc
+++ b/src/compiler/codegen/x86/fp_x86.cc
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-#include "x86_lir.h"
#include "codegen_x86.h"
-#include "../codegen_util.h"
-#include "../ralloc_util.h"
+#include "compiler/codegen/codegen_util.h"
+#include "compiler/codegen/ralloc_util.h"
+#include "x86_lir.h"
namespace art {
diff --git a/src/compiler/codegen/x86/int_x86.cc b/src/compiler/codegen/x86/int_x86.cc
index f2d023c..0ae51e0 100644
--- a/src/compiler/codegen/x86/int_x86.cc
+++ b/src/compiler/codegen/x86/int_x86.cc
@@ -16,10 +16,10 @@
/* This file contains codegen for the X86 ISA */
-#include "x86_lir.h"
#include "codegen_x86.h"
-#include "../codegen_util.h"
-#include "../ralloc_util.h"
+#include "compiler/codegen/codegen_util.h"
+#include "compiler/codegen/ralloc_util.h"
+#include "x86_lir.h"
namespace art {
diff --git a/src/compiler/codegen/x86/target_x86.cc b/src/compiler/codegen/x86/target_x86.cc
index e396e54..6cb420c 100644
--- a/src/compiler/codegen/x86/target_x86.cc
+++ b/src/compiler/codegen/x86/target_x86.cc
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#include "../../compiler_internals.h"
-#include "x86_lir.h"
#include "codegen_x86.h"
-#include "../ralloc_util.h"
-#include "../codegen_util.h"
+#include "compiler/codegen/codegen_util.h"
+#include "compiler/compiler_internals.h"
+#include "compiler/codegen/ralloc_util.h"
+#include "x86_lir.h"
#include <string>
diff --git a/src/compiler/codegen/x86/utility_x86.cc b/src/compiler/codegen/x86/utility_x86.cc
index ce55b4b..4f9e28b 100644
--- a/src/compiler/codegen/x86/utility_x86.cc
+++ b/src/compiler/codegen/x86/utility_x86.cc
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-#include "x86_lir.h"
#include "codegen_x86.h"
-#include "../codegen_util.h"
-#include "../ralloc_util.h"
+#include "compiler/codegen/codegen_util.h"
+#include "compiler/codegen/ralloc_util.h"
+#include "x86_lir.h"
namespace art {
diff --git a/src/compiler/codegen/x86/x86_lir.h b/src/compiler/codegen/x86/x86_lir.h
index edfcd4d..c272286 100644
--- a/src/compiler/codegen/x86/x86_lir.h
+++ b/src/compiler/codegen/x86/x86_lir.h
@@ -17,7 +17,7 @@
#ifndef ART_COMPILER_COMPILER_CODEGEN_X86_X86LIR_H_
#define ART_COMPILER_COMPILER_CODEGEN_X86_X86LIR_H_
-#include "../../compiler_internals.h"
+#include "compiler/compiler_internals.h"
namespace art {