From 1cfea7af6f38cd06393fed3e466701869ce8b2c3 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 24 May 2017 14:44:38 +0100 Subject: Code cleanup around vdex. 1) Handle the vdex in dex2oat instead of compiler_driver 2) CHECK instead of DCHECK that we don't dexlayout with vdex. Test: test.py Change-Id: Idf7be59bb25708181e391d17128480659ac697e5 --- compiler/driver/compiler_driver_test.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'compiler/driver/compiler_driver_test.cc') diff --git a/compiler/driver/compiler_driver_test.cc b/compiler/driver/compiler_driver_test.cc index 4b979d8125..1329fddc79 100644 --- a/compiler/driver/compiler_driver_test.cc +++ b/compiler/driver/compiler_driver_test.cc @@ -42,10 +42,7 @@ class CompilerDriverTest : public CommonCompilerTest { void CompileAll(jobject class_loader) REQUIRES(!Locks::mutator_lock_) { TimingLogger timings("CompilerDriverTest::CompileAll", false, false); TimingLogger::ScopedTiming t(__FUNCTION__, &timings); - compiler_driver_->CompileAll(class_loader, - GetDexFiles(class_loader), - /* verifier_deps */ nullptr, - &timings); + compiler_driver_->CompileAll(class_loader, GetDexFiles(class_loader), &timings); t.NewTiming("MakeAllExecutable"); MakeAllExecutable(class_loader); } -- cgit v1.2.3-59-g8ed1b