diff options
Diffstat (limited to 'runtime/oat_file_manager.cc')
| -rw-r--r-- | runtime/oat_file_manager.cc | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/runtime/oat_file_manager.cc b/runtime/oat_file_manager.cc index 3ec3826374..34b00a0394 100644 --- a/runtime/oat_file_manager.cc +++ b/runtime/oat_file_manager.cc @@ -308,13 +308,10 @@ std::vector<std::unique_ptr<const DexFile>> OatFileManager::OpenDexFilesFromOat( Locks::mutator_lock_->AssertNotHeld(self); Runtime* const runtime = Runtime::Current(); - int target_compilation_type_mask = OatFileAssistant::kFullCompilation - | OatFileAssistant::kProfileGuideCompilation - | OatFileAssistant::kExtractOnly; OatFileAssistant oat_file_assistant(dex_location, oat_location, - target_compilation_type_mask, kRuntimeISA, + /*profile_changed*/false, !runtime->IsAotCompiler()); // Lock the target oat location to avoid races generating and loading the @@ -330,7 +327,7 @@ std::vector<std::unique_ptr<const DexFile>> OatFileManager::OpenDexFilesFromOat( // Update the oat file on disk if we can. This may fail, but that's okay. // Best effort is all that matters here. - if (!oat_file_assistant.MakeUpToDate(/*out*/&error_msg)) { + if (!oat_file_assistant.MakeUpToDate(CompilerFilter::kSpeed, /*out*/ &error_msg)) { LOG(INFO) << error_msg; } @@ -484,15 +481,7 @@ void OatFileManager::DumpForSigQuit(std::ostream& os) { if (ContainsElement(boot_oat_files, oat_file.get())) { continue; } - // Use "platform-default" if it's neither extract nor profile guided. - // Saying 'full' could be misleading if for example the platform uses - // compiler filters. - const char* status = oat_file->IsExtractOnly() - ? OatHeader::kExtractOnlyValue - : oat_file->IsProfileGuideCompiled() - ? OatHeader::kProfileGuideCompiledValue - : "platform-default"; - os << oat_file->GetLocation() << ": " << status << "\n"; + os << oat_file->GetLocation() << ": " << oat_file->GetCompilerFilter() << "\n"; } } |