commit 00bc1dc4f81268d78d7dfeb298b85c56876425a9
author Brian Carlstrom <bdc@google.com> Fri Feb 01 15:56:27 2013 -0800
committer Brian Carlstrom <bdc@google.com> Fri Feb 01 18:01:50 2013 -0800
tree bae8027055563460692e87f18f31aac1b61d0ef0
parent 12a2bdd245ea866b665d4800b493397ec412892a

Remove separate libart-compiler-llvm

Change-Id: I82303c6db3361e2842ff9d882f43f7d0830584b1

src/compiler.cc

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");