diff options
Diffstat (limited to 'profman/profile_assistant.cc')
-rw-r--r-- | profman/profile_assistant.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/profman/profile_assistant.cc b/profman/profile_assistant.cc index 7107944d70..1695d8c3a6 100644 --- a/profman/profile_assistant.cc +++ b/profman/profile_assistant.cc @@ -58,6 +58,12 @@ ProfileAssistant::ProcessingResult ProfileAssistant::ProcessProfilesInternal( ProfileCompilationInfo cur_info; if (!cur_info.Load(profile_files[i]->Fd(), /*merge_classes=*/ true, filter_fn)) { LOG(WARNING) << "Could not load profile file at index " << i; + if (options.IsForceMerge()) { + // If we have to merge forcefully, ignore load failures. + // This is useful for boot image profiles to ignore stale profiles which are + // cleared lazily. + continue; + } return kErrorBadProfiles; } |