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/stub_compiler.h b/src/compiler_llvm/stub_compiler.h
index 9139acc..312b3af 100644
--- a/src/compiler_llvm/stub_compiler.h
+++ b/src/compiler_llvm/stub_compiler.h
@@ -33,19 +33,19 @@
namespace art {
namespace compiler_llvm {
-class CompilationUnit;
+class LlvmCompilationUnit;
class CompilerLLVM;
class IRBuilder;
class StubCompiler {
public:
- StubCompiler(CompilationUnit* cunit, Compiler& compiler);
+ StubCompiler(LlvmCompilationUnit* cunit, Compiler& compiler);
CompiledInvokeStub* CreateInvokeStub(bool is_static, const char* shorty);
CompiledInvokeStub* CreateProxyStub(const char* shorty);
private:
- CompilationUnit* cunit_;
+ LlvmCompilationUnit* cunit_;
const Compiler* compiler_;
llvm::Module* module_;
llvm::LLVMContext* context_;