From 45724f9a0cc38dbb3071beb3eeab96499868b49c Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Wed, 17 Feb 2016 17:46:10 +0000 Subject: Revert "Allow method references across oat files for multi-image." Breaks Quick tests. This reverts commit 6065402316da2b51eed5fc34cffbd991766bd408. Change-Id: I8a5469ba7cea5f46b85cb489b3e0ef06ed548f03 --- compiler/common_compiler_test.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'compiler/common_compiler_test.cc') diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc index 239bc590e9..e4bfac9ee7 100644 --- a/compiler/common_compiler_test.cc +++ b/compiler/common_compiler_test.cc @@ -194,15 +194,16 @@ void CommonCompilerTest::CreateCompilerDriver(Compiler::Kind kind, InstructionSe kind, isa, instruction_set_features_.get(), - /* boot_image */ true, + true, GetImageClasses(), GetCompiledClasses(), GetCompiledMethods(), - /* thread_count */ 2, - /* dump_stats */ true, - /* dump_passes */ true, + 2, + true, + true, timer_.get(), - /* swap_fd */ -1, + -1, + /* dex_to_oat_map */ nullptr, GetProfileCompilationInfo())); // We typically don't generate an image in unit tests, disable this optimization by default. compiler_driver_->SetSupportBootImageFixup(false); -- cgit v1.2.3-59-g8ed1b