diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-11 16:27:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-11 16:27:44 +0000 |
| commit | 1b4902086744563ba75b076b768b2609b59f9203 (patch) | |
| tree | 901e2798789429f1bb9d266c26757802f3e6aa56 /runtime/common_runtime_test.cc | |
| parent | 356286f989941ac495417195e4129aaceaf36a83 (diff) | |
| parent | 2969bcdcd80624e4a4fef696b54c2c76b44b6853 (diff) | |
| download | art-1b4902086744563ba75b076b768b2609b59f9203.tar.gz art-1b4902086744563ba75b076b768b2609b59f9203.tar.bz2 art-1b4902086744563ba75b076b768b2609b59f9203.zip | |
Merge "ART: Refactor unstarted runtime"
Diffstat (limited to 'runtime/common_runtime_test.cc')
| -rw-r--r-- | runtime/common_runtime_test.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc index 1c8a8925d8..c7cee4708b 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]; |