From 327c5ed30a1f016ef3e1bb26ea7b4abd34eb63b9 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Mon, 13 Jul 2015 11:53:56 +0000 Subject: Revert "Make dex2dex return a CompiledMethod after quickening." Build failures on arm/arm64. This reverts commit 6920703c8eae0d90528ea09945e742582b6f8198. Change-Id: I0dd5426610150937dac6e4d9dd9aa759bdf7fca4 --- compiler/driver/compiler_driver.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'compiler/driver/compiler_driver.h') diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h index 5cf4044fd4..2d7ceaeea1 100644 --- a/compiler/driver/compiler_driver.h +++ b/compiler/driver/compiler_driver.h @@ -675,13 +675,12 @@ class CompilerDriver { typedef void (*CompilerCallbackFn)(CompilerDriver& driver); typedef MutexLock* (*CompilerMutexLockFn)(CompilerDriver& driver); - typedef CompiledMethod* (*DexToDexCompilerFn)( - CompilerDriver& driver, - const DexFile::CodeItem* code_item, - uint32_t access_flags, InvokeType invoke_type, - uint32_t class_dex_idx, uint32_t method_idx, - jobject class_loader, const DexFile& dex_file, - DexToDexCompilationLevel dex_to_dex_compilation_level); + typedef void (*DexToDexCompilerFn)(CompilerDriver& driver, + const DexFile::CodeItem* code_item, + uint32_t access_flags, InvokeType invoke_type, + uint32_t class_dex_idx, uint32_t method_idx, + jobject class_loader, const DexFile& dex_file, + DexToDexCompilationLevel dex_to_dex_compilation_level); DexToDexCompilerFn dex_to_dex_compiler_; void* compiler_context_; -- cgit v1.2.3-59-g8ed1b