commit 2e17cf4854138d3a3021fdddc7851215b0eba28b
author Nicolas Geoffray <ngeoffray@google.com> Thu Mar 12 21:19:46 2020 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Mar 13 12:03:13 2020 +0000
tree da227e647f9a54d90caf88610f3b4e24c8dad76b
parent eb070f085df78fc39ad2c06f0638edcf0537e6a3

Revert "ART: Conditionally remove loaded-oat-count check"

Bug: 128688902
Bug: 150032912
Test: boots

This reverts commit e912955b98cdc224f2f13455f592b63e96bf5634.

(cherry-picked from commit 3734c2822fe2dc8eaaedbc311f9828ce443b02e6)

Merged-In: I209489f69e4f2b02e7fa93090539575098a28025
Change-Id: I209489f69e4f2b02e7fa93090539575098a28025

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 3a94ef6..1a83372 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1785,7 +1785,7 @@
 
   // Set OnlyUseSystemOatFiles only after boot classpath has been set up.
   if (runtime_options.Exists(Opt::OnlyUseSystemOatFiles)) {
-    oat_file_manager_->SetOnlyUseSystemOatFiles(/*assert_no_files_loaded=*/ true);
+    oat_file_manager_->SetOnlyUseSystemOatFiles();
   }
 
   return true;