Revert "Disable check that no oat libraries are loaded."
This reverts commit 097d976411caec0b72194523c73e30ebbece14b0.
Bug: 128529256
Reason for revert: Breaks FSI
Change-Id: I44acd5ffafd5a29941e3ad5265a03fc78cd29369
diff --git a/runtime/oat_file_manager.cc b/runtime/oat_file_manager.cc
index 2642cd8..b03551b 100644
--- a/runtime/oat_file_manager.cc
+++ b/runtime/oat_file_manager.cc
@@ -645,12 +645,7 @@
void OatFileManager::SetOnlyUseSystemOatFiles(bool assert_no_files_loaded) {
ReaderMutexLock mu(Thread::Current(), *Locks::oat_file_manager_lock_);
if (assert_no_files_loaded) {
- // Make sure all files that were loaded up to this point are on /system.
- if (kIsTargetBuild) {
- for (const std::unique_ptr<const OatFile>& oat_file : oat_files_) {
- CHECK(LocationIsOnSystem(oat_file->GetLocation().c_str())) << oat_file->GetLocation();
- }
- }
+ CHECK_EQ(oat_files_.size(), GetBootOatFiles().size());
}
only_use_system_oat_files_ = true;
}