diff options
| author | Shih-wei Liao <sliao@google.com> | 2012-03-29 19:15:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-29 19:15:39 -0700 |
| commit | b0e106502493208b6a7304ab41447a2c73a8bfe0 (patch) | |
| tree | 6c8d61c0f7e372c1cc43e5cf7abd7d833eb13c49 | |
| parent | 5dfc15a6c1cb73f2050d658fd4c92895cc7f73d1 (diff) | |
| parent | b1ab7df793844398c71ee18c2bd60e3bc6484d10 (diff) | |
| download | art-b0e106502493208b6a7304ab41447a2c73a8bfe0.zip art-b0e106502493208b6a7304ab41447a2c73a8bfe0.tar.gz art-b0e106502493208b6a7304ab41447a2c73a8bfe0.tar.bz2 | |
Merge "Cope with runtime refactoring on the LLVM side." into ics-mr1-plus-art
| -rw-r--r-- | build/Android.common.mk | 3 | ||||
| -rw-r--r-- | src/compiler_llvm/compiler_llvm.cc | 3 | ||||
| -rw-r--r-- | src/compiler_llvm/runtime_support_llvm.cc | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index bc1825e..41edefa 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -192,7 +192,7 @@ LIBART_COMMON_SRC_FILES += \ src/compiler_llvm/inferred_reg_category_map.cc \ src/compiler_llvm/runtime_support_llvm.cc \ src/compiler_llvm/utils_llvm.cc -else +endif LIBART_COMMON_SRC_FILES += \ src/oat/runtime/arm/stub_arm.cc \ src/oat/runtime/context.cc \ @@ -217,7 +217,6 @@ LIBART_COMMON_SRC_FILES += \ src/oat/utils/assembler.cc \ src/oat/utils/x86/assembler_x86.cc \ src/oat/utils/x86/managed_register_x86.cc -endif LIBART_TARGET_SRC_FILES := \ $(LIBART_COMMON_SRC_FILES) \ diff --git a/src/compiler_llvm/compiler_llvm.cc b/src/compiler_llvm/compiler_llvm.cc index a646b6f..75ced8b 100644 --- a/src/compiler_llvm/compiler_llvm.cc +++ b/src/compiler_llvm/compiler_llvm.cc @@ -314,13 +314,12 @@ extern "C" art::CompiledMethod* ArtCompileMethod(art::Compiler& compiler, extern "C" art::CompiledMethod* ArtJniCompileMethod(art::Compiler& compiler, uint32_t access_flags, uint32_t method_idx, - const art::ClassLoader* class_loader, const art::DexFile& dex_file) { art::ClassLinker *class_linker = art::Runtime::Current()->GetClassLinker(); art::DexCache *dex_cache = class_linker->FindDexCache(dex_file); art::OatCompilationUnit oat_compilation_unit( - class_loader, class_linker, dex_file, *dex_cache, NULL, + NULL, class_linker, dex_file, *dex_cache, NULL, method_idx, access_flags); art::compiler_llvm::CompilerLLVM* compiler_llvm = ContextOf(compiler); diff --git a/src/compiler_llvm/runtime_support_llvm.cc b/src/compiler_llvm/runtime_support_llvm.cc index 0a203e9..02a201a 100644 --- a/src/compiler_llvm/runtime_support_llvm.cc +++ b/src/compiler_llvm/runtime_support_llvm.cc @@ -4,7 +4,7 @@ #include "dex_verifier.h" #include "object.h" #include "object_utils.h" -#include "runtime_support_common.h" +#include "runtime_support.h" #include "runtime_support_llvm.h" #include "shadow_frame.h" #include "thread.h" |