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/mips/assemble_mips.cc b/src/compiler/codegen/mips/assemble_mips.cc
index c0ed3b6..34a91b0 100644
--- a/src/compiler/codegen/mips/assemble_mips.cc
+++ b/src/compiler/codegen/mips/assemble_mips.cc
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#include "mips_lir.h"
#include "codegen_mips.h"
-#include "../codegen_util.h"
+#include "compiler/codegen/codegen_util.h"
+#include "mips_lir.h"
namespace art {
diff --git a/src/compiler/codegen/mips/call_mips.cc b/src/compiler/codegen/mips/call_mips.cc
index 76c9fbd..39fdc03 100644
--- a/src/compiler/codegen/mips/call_mips.cc
+++ b/src/compiler/codegen/mips/call_mips.cc
@@ -16,11 +16,11 @@
/* This file contains codegen for the Mips ISA */
-#include "oat/runtime/oat_support_entrypoints.h"
-#include "mips_lir.h"
#include "codegen_mips.h"
-#include "../codegen_util.h"
-#include "../ralloc_util.h"
+#include "compiler/codegen/codegen_util.h"
+#include "compiler/codegen/ralloc_util.h"
+#include "mips_lir.h"
+#include "oat/runtime/oat_support_entrypoints.h"
namespace art {
diff --git a/src/compiler/codegen/mips/codegen_mips.h b/src/compiler/codegen/mips/codegen_mips.h
index fcd5669..705ecfa 100644
--- a/src/compiler/codegen/mips/codegen_mips.h
+++ b/src/compiler/codegen/mips/codegen_mips.h
@@ -17,7 +17,8 @@
#ifndef ART_SRC_COMPILER_CODEGEN_MIPS_CODEGENMIPS_H_
#define ART_SRC_COMPILER_CODEGEN_MIPS_CODEGENMIPS_H_
-#include "../../compiler_internals.h"
+#include "compiler/compiler_internals.h"
+#include "mips_lir.h"
namespace art {
diff --git a/src/compiler/codegen/mips/fp_mips.cc b/src/compiler/codegen/mips/fp_mips.cc
index 6ffc5e0..e7b106e 100644
--- a/src/compiler/codegen/mips/fp_mips.cc
+++ b/src/compiler/codegen/mips/fp_mips.cc
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#include "oat/runtime/oat_support_entrypoints.h"
-#include "mips_lir.h"
#include "codegen_mips.h"
-#include "../codegen_util.h"
-#include "../ralloc_util.h"
+#include "compiler/codegen/codegen_util.h"
+#include "compiler/codegen/ralloc_util.h"
+#include "mips_lir.h"
+#include "oat/runtime/oat_support_entrypoints.h"
namespace art {
diff --git a/src/compiler/codegen/mips/int_mips.cc b/src/compiler/codegen/mips/int_mips.cc
index 86f0527..7da4cf6 100644
--- a/src/compiler/codegen/mips/int_mips.cc
+++ b/src/compiler/codegen/mips/int_mips.cc
@@ -16,11 +16,11 @@
/* This file contains codegen for the Mips ISA */
-#include "oat/runtime/oat_support_entrypoints.h"
-#include "mips_lir.h"
#include "codegen_mips.h"
-#include "../codegen_util.h"
-#include "../ralloc_util.h"
+#include "compiler/codegen/codegen_util.h"
+#include "compiler/codegen/ralloc_util.h"
+#include "mips_lir.h"
+#include "oat/runtime/oat_support_entrypoints.h"
namespace art {
diff --git a/src/compiler/codegen/mips/mips_lir.h b/src/compiler/codegen/mips/mips_lir.h
index cecd4ab..41e598f 100644
--- a/src/compiler/codegen/mips/mips_lir.h
+++ b/src/compiler/codegen/mips/mips_lir.h
@@ -17,7 +17,7 @@
#ifndef ART_COMPILER_COMPILER_CODEGEN_MIPS_MIPSLIR_H_
#define ART_COMPILER_COMPILER_CODEGEN_MIPS_MIPSLIR_H_
-#include "../../compiler_internals.h"
+#include "compiler/compiler_internals.h"
namespace art {
diff --git a/src/compiler/codegen/mips/target_mips.cc b/src/compiler/codegen/mips/target_mips.cc
index 3bb4689..de19ac0 100644
--- a/src/compiler/codegen/mips/target_mips.cc
+++ b/src/compiler/codegen/mips/target_mips.cc
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#include "../../compiler_internals.h"
-#include "mips_lir.h"
#include "codegen_mips.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 "mips_lir.h"
#include <string>
diff --git a/src/compiler/codegen/mips/utility_mips.cc b/src/compiler/codegen/mips/utility_mips.cc
index 4d4be76..1e217fb 100644
--- a/src/compiler/codegen/mips/utility_mips.cc
+++ b/src/compiler/codegen/mips/utility_mips.cc
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-#include "mips_lir.h"
#include "codegen_mips.h"
-#include "../codegen_util.h"
-#include "../ralloc_util.h"
+#include "compiler/codegen/codegen_util.h"
+#include "compiler/codegen/ralloc_util.h"
+#include "mips_lir.h"
namespace art {