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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/compiler_llvm/method_compiler.h b/src/compiler_llvm/method_compiler.h
index dd9d1829c3..4d759e501a 100644
--- a/src/compiler_llvm/method_compiler.h
+++ b/src/compiler_llvm/method_compiler.h
@@ -64,14 +64,14 @@ namespace llvm {
 namespace art {
 namespace compiler_llvm {
 
-class CompilationUnit;
+class LlvmCompilationUnit;
 class CompilerLLVM;
 class DalvikReg;
 class IRBuilder;
 
 class MethodCompiler {
  public:
-  MethodCompiler(CompilationUnit* cunit,
+  MethodCompiler(LlvmCompilationUnit* cunit,
                  Compiler* compiler,
                  OatCompilationUnit* oat_compilation_unit);
 
@@ -447,7 +447,7 @@ class MethodCompiler {
   void ComputeMethodInfo();
 
  private:
-  CompilationUnit* cunit_;
+  LlvmCompilationUnit* cunit_;
   Compiler* compiler_;
 
   const DexFile* dex_file_;