From 2969bcdcd80624e4a4fef696b54c2c76b44b6853 Mon Sep 17 00:00:00 2001
From: Andreas Gampe <agampe@google.com>
Date: Mon, 9 Mar 2015 12:57:41 -0700
Subject: ART: Refactor unstarted runtime

Refactor and clean up unstarted runtime.

Bug: 19542228
Change-Id: Ib3e4b3517e06e8242d4fed32ca59419fef553a47
---
 runtime/common_runtime_test.cc | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'runtime/common_runtime_test.cc')

diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc
index 8dd9a46001..ceae9e857b 100644
--- a/runtime/common_runtime_test.cc
+++ b/runtime/common_runtime_test.cc
@@ -236,6 +236,11 @@ void CommonRuntimeTest::SetUp() {
   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];
-- 
cgit v1.2.3