From 641ce0371c2f0dc95d26be02d8366124c8b66653 Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Thu, 31 Jan 2013 15:21:37 -0800 Subject: 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 --- src/compiler_llvm/method_compiler.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/compiler_llvm/method_compiler.cc') diff --git a/src/compiler_llvm/method_compiler.cc b/src/compiler_llvm/method_compiler.cc index 76b1299b6f..47d9b015ff 100644 --- a/src/compiler_llvm/method_compiler.cc +++ b/src/compiler_llvm/method_compiler.cc @@ -20,11 +20,11 @@ #include "base/logging.h" #include "base/stl_util.h" #include "base/stringprintf.h" -#include "compilation_unit.h" #include "compiler.h" #include "dalvik_reg.h" #include "greenland/inferred_reg_category_map.h" #include "ir_builder.h" +#include "llvm_compilation_unit.h" #include "mirror/object.h" #include "oat_compilation_unit.h" #include "object_utils.h" @@ -46,7 +46,7 @@ namespace compiler_llvm { using namespace runtime_support; -MethodCompiler::MethodCompiler(CompilationUnit* cunit, +MethodCompiler::MethodCompiler(LlvmCompilationUnit* cunit, Compiler* compiler, OatCompilationUnit* oat_compilation_unit) : cunit_(cunit), compiler_(compiler), -- cgit v1.2.3-59-g8ed1b