diff options
| author | 2013-01-31 15:21:37 -0800 | |
|---|---|---|
| committer | 2013-02-01 12:22:53 -0800 | |
| commit | 641ce0371c2f0dc95d26be02d8366124c8b66653 (patch) | |
| tree | 5c132a223a739e852849d6a0d1b9ffef4305dfc3 /src/compiler_llvm/jni_compiler.cc | |
| parent | 6cbd384cb98c6619c73fe4f76ef40a34ac6f355d (diff) | |
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
Diffstat (limited to 'src/compiler_llvm/jni_compiler.cc')
| -rw-r--r-- | src/compiler_llvm/jni_compiler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler_llvm/jni_compiler.cc b/src/compiler_llvm/jni_compiler.cc index fdd2b43358..8d49aba971 100644 --- a/src/compiler_llvm/jni_compiler.cc +++ b/src/compiler_llvm/jni_compiler.cc @@ -18,11 +18,11 @@ #include "base/logging.h" #include "class_linker.h" -#include "compilation_unit.h" #include "compiled_method.h" #include "compiler.h" #include "compiler_llvm.h" #include "ir_builder.h" +#include "llvm_compilation_unit.h" #include "mirror/abstract_method.h" #include "oat_compilation_unit.h" #include "runtime.h" @@ -42,7 +42,7 @@ namespace compiler_llvm { using namespace runtime_support; -JniCompiler::JniCompiler(CompilationUnit* cunit, +JniCompiler::JniCompiler(LlvmCompilationUnit* cunit, Compiler const& compiler, OatCompilationUnit* oat_compilation_unit) : cunit_(cunit), compiler_(&compiler), module_(cunit_->GetModule()), |