Update verify-profile logic.
To start measuring OTA time improvements correctly, return
verify-profile as non-profile filter of verify-profile.
bug:34715556
Test: device boots, interpret-only is not used
Change-Id: I098a23d6dc958530df4eb94209d07d735576e0eb
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index 1d4eaf8..cf95c5e 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -311,9 +311,6 @@
compiler_->Init();
- if (compiler_options->VerifyOnlyProfile()) {
- CHECK(profile_compilation_info_ != nullptr) << "Requires profile";
- }
if (GetCompilerOptions().IsBootImage()) {
CHECK(image_classes_.get() != nullptr) << "Expected image classes for boot image";
}
diff --git a/runtime/compiler_filter.cc b/runtime/compiler_filter.cc
index cb8c11d..dc55ab8 100644
--- a/runtime/compiler_filter.cc
+++ b/runtime/compiler_filter.cc
@@ -113,7 +113,10 @@
case CompilerFilter::kSpeed:
case CompilerFilter::kEverything: return false;
- case CompilerFilter::kVerifyProfile:
+ // verify-profile doesn't look at profiles anymore.
+ // TODO(ngeoffray): this will be cleaned up with b/34715556.
+ case CompilerFilter::kVerifyProfile: return false;
+
case CompilerFilter::kSpaceProfile:
case CompilerFilter::kSpeedProfile:
case CompilerFilter::kEverythingProfile: return true;
@@ -134,7 +137,9 @@
return filter;
case CompilerFilter::kVerifyProfile:
- return CompilerFilter::kInterpretOnly;
+ // verify-profile doesn't look at profiles anymore.
+ // TODO(ngeoffray): this will be cleaned up with b/34715556.
+ return filter;
case CompilerFilter::kSpaceProfile:
return CompilerFilter::kSpace;