diff options
| author | 2013-07-12 09:48:25 -0700 | |
|---|---|---|
| committer | 2013-07-12 09:48:25 -0700 | |
| commit | 3693c086ad4d5ba13ffcc7c7f481b21f67543660 (patch) | |
| tree | 9b3d40be35ee56c84f4df947d4800be0d6dc9cb2 | |
| parent | 1581766afea0b31de0ed0f9f677fc3b92a29daae (diff) | |
Fixes for portable build
Change-Id: I29d6a9fb7f8ec134128329d974acf6b6534e25f1
| -rw-r--r-- | src/class_linker.cc | 2 | ||||
| -rw-r--r-- | src/compiler/elf_writer_mclinker.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/class_linker.cc b/src/class_linker.cc index 159fbf728b..8ea4295702 100644 --- a/src/class_linker.cc +++ b/src/class_linker.cc @@ -60,7 +60,7 @@ #include "runtime.h" #include "runtime_support.h" #if defined(ART_USE_PORTABLE_COMPILER) -#include "compiler/llvm/runtime_support_llvm.h" +#include "runtime_support_llvm.h" #endif #include "ScopedLocalRef.h" #include "scoped_thread_state_change.h" diff --git a/src/compiler/elf_writer_mclinker.cc b/src/compiler/elf_writer_mclinker.cc index e1d98f6919..47887a5086 100644 --- a/src/compiler/elf_writer_mclinker.cc +++ b/src/compiler/elf_writer_mclinker.cc @@ -233,7 +233,7 @@ void ElfWriterMclinker::AddMethodInputs(const std::vector<const DexFile*>& dex_f const DexFile& dex_file = it.GetDexFile(); uint32_t method_idx = it.GetMemberIndex(); const CompiledMethod* compiled_method = - compiler_driver_->GetCompiledMethod(CompilerDriver::MethodReference(&dex_file, method_idx)); + compiler_driver_->GetCompiledMethod(MethodReference(&dex_file, method_idx)); if (compiled_method != NULL) { AddCompiledCodeInput(*compiled_method); } @@ -355,7 +355,7 @@ void ElfWriterMclinker::FixupOatMethodOffsets(const std::vector<const DexFile*>& CHECK(method != NULL); } const CompiledMethod* compiled_method = - compiler_driver_->GetCompiledMethod(CompilerDriver::MethodReference(&dex_file, method_idx)); + compiler_driver_->GetCompiledMethod(MethodReference(&dex_file, method_idx)); if (compiled_method != NULL) { uint32_t offset = FixupCompiledCodeOffset(*elf_file.get(), oatdata_address, *compiled_method); // Don't overwrite static method trampoline |