Remove separate libart-compiler-llvm
Change-Id: I82303c6db3361e2842ff9d882f43f7d0830584b1
diff --git a/src/compiler.cc b/src/compiler.cc
index 903b70a..48aa335 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -246,12 +246,7 @@
const char* suffix = (kIsDebugBuild ? "d" : "");
// Work out the filename for the compiler library.
- std::string library_name;
- if ((compiler_backend == kPortable) || (compiler_backend == kIceland)) {
- library_name = StringPrintf("art%s-compiler-llvm", suffix);
- } else {
- library_name = StringPrintf("art%s-compiler", suffix);
- }
+ std::string library_name(StringPrintf("art%s-compiler", suffix));
std::string filename(StringPrintf(OS_SHARED_LIB_FORMAT_STR, library_name.c_str()));
#if defined(__APPLE__)
@@ -336,7 +331,12 @@
init_compiler_context(*this);
- jni_compiler_ = FindFunction<JniCompilerFn>(compiler_so_name, compiler_library_, "ArtJniCompileMethod");
+ if ((compiler_backend_ == kPortable) || (compiler_backend_ == kIceland)){
+ jni_compiler_ = FindFunction<JniCompilerFn>(compiler_so_name, compiler_library_, "ArtLLVMJniCompileMethod");
+ } else {
+ jni_compiler_ = FindFunction<JniCompilerFn>(compiler_so_name, compiler_library_, "ArtQuickJniCompileMethod");
+ }
+
if ((compiler_backend_ == kPortable) || (compiler_backend_ == kIceland)){
create_invoke_stub_ =
FindFunction<CreateInvokeStubFn>(compiler_so_name, compiler_library_, "ArtCreateLLVMInvokeStub");
diff --git a/src/compiler_llvm/compiler_llvm.cc b/src/compiler_llvm/compiler_llvm.cc
index 7237911..55c7edb 100644
--- a/src/compiler_llvm/compiler_llvm.cc
+++ b/src/compiler_llvm/compiler_llvm.cc
@@ -262,9 +262,9 @@
return result;
}
-extern "C" art::CompiledMethod* ArtJniCompileMethod(art::Compiler& compiler,
- uint32_t access_flags, uint32_t method_idx,
- const art::DexFile& dex_file) {
+extern "C" art::CompiledMethod* ArtLLVMJniCompileMethod(art::Compiler& compiler,
+ uint32_t access_flags, uint32_t method_idx,
+ const art::DexFile& dex_file) {
art::ClassLinker *class_linker = art::Runtime::Current()->GetClassLinker();
art::OatCompilationUnit oat_compilation_unit(
diff --git a/src/oat/jni/jni_compiler.cc b/src/oat/jni/jni_compiler.cc
index c0298de..ae5bce4 100644
--- a/src/oat/jni/jni_compiler.cc
+++ b/src/oat/jni/jni_compiler.cc
@@ -481,8 +481,8 @@
} // namespace art
-extern "C" art::CompiledMethod* ArtJniCompileMethod(art::Compiler& compiler,
- uint32_t access_flags, uint32_t method_idx,
- const art::DexFile& dex_file) {
+extern "C" art::CompiledMethod* ArtQuickJniCompileMethod(art::Compiler& compiler,
+ uint32_t access_flags, uint32_t method_idx,
+ const art::DexFile& dex_file) {
return ArtJniCompileMethodInternal(compiler, access_flags, method_idx, dex_file);
}