diff options
| author | 2017-03-09 13:13:25 +0000 | |
|---|---|---|
| committer | 2017-03-09 20:54:21 +0000 | |
| commit | 97fa9928c07d3e0ee631235e9619fb0f8949ed7a (patch) | |
| tree | cd19ef9879b0dac1237a8be0d6a0075fcbe54f51 /compiler/driver/compiler_driver.cc | |
| parent | 2c3fc44464d261c8ae285abbd140b4523dba005c (diff) | |
Do not allow input-vdex with dexlayout.
input-vdex and dexlayout are incompatible with each other.
bug: 36084905
bug: 36076104
bug: 36059948
bug: 35872504
Test: device boots, vdex works on OTA, input-vdex is not passed
for speed-profile.
Change-Id: I630c90acf0a8f49f50b7909e2dec995dd4a4d13f
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 057e3c9960..995098799c 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -480,7 +480,9 @@ static void Unquicken(const std::vector<const DexFile*>& dex_files, DCHECK(!it.HasNext()); } } - DCHECK_EQ(quickening_info_ptr, quickening_info_end) << "Failed to use all quickening info"; + if (quickening_info_ptr != quickening_info_end) { + LOG(FATAL) << "Failed to use all quickening info"; + } } void CompilerDriver::CompileAll(jobject class_loader, |