commit e5c48f75476bc7bac843c862dfeeaeed2b95d94f
author Nicolas Geoffray <ngeoffray@google.com> Wed Mar 11 11:28:43 2020 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Mar 11 15:01:33 2020 +0000
tree 81457b683b6d55148eea0b023ddb264daad9f502
parent 085f3805cdfde5fdb130e31a2cf83071598ef082

Revert "ART: Forbid the zygote to load code outside of system"

This reverts commit 9ef308da0ea8d1df2edf65d4957599fafcc56aeb.

Bug: 150032912
Bug: 129454856
Test: boots
Change-Id: I522b1e0e2b9116239ca206aa5c65347976eac7ab

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index b739450..3a94ef6 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1784,9 +1784,8 @@
   VLOG(startup) << "Runtime::Init exiting";
 
   // Set OnlyUseSystemOatFiles only after boot classpath has been set up.
-  if (is_zygote_ || runtime_options.Exists(Opt::OnlyUseSystemOatFiles)) {
-    oat_file_manager_->SetOnlyUseSystemOatFiles(/*enforce=*/ true,
-                                                /*assert_no_files_loaded=*/ true);
+  if (runtime_options.Exists(Opt::OnlyUseSystemOatFiles)) {
+    oat_file_manager_->SetOnlyUseSystemOatFiles(/*assert_no_files_loaded=*/ true);
   }
 
   return true;