From 17965ed6ec29407599a0bcd4ea92532424294fed Mon Sep 17 00:00:00 2001 From: Sebastien Hertz Date: Fri, 4 Apr 2014 15:59:53 +0200 Subject: [PATCH] Re-enable DEX-to-DEX compilation path Bug: 13807032 Change-Id: I6de7adb81a0f955a93257b83db9ad689ebcd90ad --- compiler/driver/compiler_driver.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index b12b6a729..a241d5146 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -1898,8 +1898,9 @@ void CompilerDriver::CompileMethod(const DexFile::CodeItem* code_item, uint32_t compiled_method = compiler_->Compile( *this, code_item, access_flags, invoke_type, class_def_idx, method_idx, class_loader, dex_file); - } else if (dex_to_dex_compilation_level != kDontDexToDexCompile) { - // TODO: add a mode to disable DEX-to-DEX compilation ? + } + if (compiled_method == nullptr && dex_to_dex_compilation_level != kDontDexToDexCompile) { + // TODO: add a command-line option to disable DEX-to-DEX compilation ? (*dex_to_dex_compiler_)(*this, code_item, access_flags, invoke_type, class_def_idx, method_idx, class_loader, dex_file, -- 2.11.0