ART: Refactor unstarted runtime
Refactor and clean up unstarted runtime.
Bug: 19542228
Change-Id: Ib3e4b3517e06e8242d4fed32ca59419fef553a47
diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc
index 8dd9a46..ceae9e8 100644
--- a/runtime/common_runtime_test.cc
+++ b/runtime/common_runtime_test.cc
@@ -236,6 +236,11 @@
runtime_.reset(Runtime::Current());
class_linker_ = runtime_->GetClassLinker();
class_linker_->FixupDexCaches(runtime_->GetResolutionMethod());
+
+ // Initialize maps for unstarted runtime. This needs to be here, as running clinits needs this
+ // set up.
+ interpreter::UnstartedRuntimeInitialize();
+
class_linker_->RunRootClinits();
boot_class_path_ = class_linker_->GetBootClassPath();
java_lang_dex_file_ = boot_class_path_[0];