Merge branch 'dalvik-dev' of https://googleplex-android.googlesource.com/a/platform/art into fixes-for-art-build-with-mr2

Change-Id: Ie46d1f77f98b8a6f55f02b8614cb88b36b6a2d44

1 files changed, 0 insertions, 20 deletions

diff --git a/src/compiler/llvm/compiler_llvm.cc b/src/compiler/llvm/compiler_llvm.cc
index b57cbd7908..347a4dbf52 100644
--- a/src/compiler/llvm/compiler_llvm.cc
+++ b/src/compiler/llvm/compiler_llvm.cc
@@ -173,17 +173,6 @@ CompileNativeMethod(DexCompilationUnit* dex_compilation_unit) {
 }
 
 
-CompiledInvokeStub* CompilerLLVM::CreateInvokeStub(bool is_static,
-                                                   char const *shorty) {
-  UniquePtr<LlvmCompilationUnit> cunit(AllocateCompilationUnit());
-
-  UniquePtr<StubCompiler> stub_compiler(
-    new StubCompiler(cunit.get(), *compiler_driver_));
-
-  return stub_compiler->CreateInvokeStub(is_static, shorty);
-}
-
-
 CompiledInvokeStub* CompilerLLVM::CreateProxyStub(char const *shorty) {
   UniquePtr<LlvmCompilationUnit> cunit(AllocateCompilationUnit());
 
@@ -254,15 +243,6 @@ extern "C" art::CompiledMethod* ArtLLVMJniCompileMethod(art::CompilerDriver& dri
   return result;
 }
 
-extern "C" art::CompiledInvokeStub* ArtCreateLLVMInvokeStub(art::CompilerDriver& driver,
-                                                            bool is_static,
-                                                            const char* shorty,
-                                                            uint32_t shorty_len) {
-  art::llvm::CompilerLLVM* compiler_llvm = ContextOf(driver);
-  art::CompiledInvokeStub* result = compiler_llvm->CreateInvokeStub(is_static, shorty);
-  return result;
-}
-
 extern "C" art::CompiledInvokeStub* ArtCreateProxyStub(art::CompilerDriver& driver,
                                                        const char* shorty,
                                                        uint32_t shorty_len) {