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_llvm/jni_compiler.h b/src/compiler_llvm/jni_compiler.h
index 0731e92..4648180 100644
--- a/src/compiler_llvm/jni_compiler.h
+++ b/src/compiler_llvm/jni_compiler.h
@@ -46,12 +46,12 @@
namespace art {
namespace compiler_llvm {
-class CompilationUnit;
+class LlvmCompilationUnit;
class IRBuilder;
class JniCompiler {
public:
- JniCompiler(CompilationUnit* cunit,
+ JniCompiler(LlvmCompilationUnit* cunit,
Compiler const& compiler,
OatCompilationUnit* oat_compilation_unit);
@@ -64,7 +64,7 @@
bool is_static, bool is_target_function);
private:
- CompilationUnit* cunit_;
+ LlvmCompilationUnit* cunit_;
const Compiler* compiler_;
llvm::Module* module_;