diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-07-12 09:57:10 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-07-12 09:57:10 -0700 |
| commit | 098249eb69eb204d9eef5b47269079407e5195f5 (patch) | |
| tree | b9f37158659792bbf4fad05d66abdf342310b1d0 /src | |
| parent | 3d92d523089bdd7881d2319414a29bf77172b432 (diff) | |
| parent | dab6f91d32aef2f94682222e36501e758f052978 (diff) | |
| download | android_art-098249eb69eb204d9eef5b47269079407e5195f5.tar.gz android_art-098249eb69eb204d9eef5b47269079407e5195f5.tar.bz2 android_art-098249eb69eb204d9eef5b47269079407e5195f5.zip | |
Merge remote-tracking branch 'goog/dalvik-dev' into merge-art-to-master
Diffstat (limited to 'src')
| -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 |