diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-09 12:57:41 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-03-11 09:27:03 -0700 |
| commit | 2969bcdcd80624e4a4fef696b54c2c76b44b6853 (patch) | |
| tree | a097d139d5525ec2af6682f3e37bda94dead8cc9 /dex2oat/dex2oat.cc | |
| parent | f719fdd20e6282f3579cb99529bb65e852612647 (diff) | |
| download | art-2969bcdcd80624e4a4fef696b54c2c76b44b6853.zip art-2969bcdcd80624e4a4fef696b54c2c76b44b6853.tar.gz art-2969bcdcd80624e4a4fef696b54c2c76b44b6853.tar.bz2 | |
ART: Refactor unstarted runtime
Refactor and clean up unstarted runtime.
Bug: 19542228
Change-Id: Ib3e4b3517e06e8242d4fed32ca59419fef553a47
Diffstat (limited to 'dex2oat/dex2oat.cc')
| -rw-r--r-- | dex2oat/dex2oat.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index c3303e1..bb80a70 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -56,6 +56,7 @@ #include "gc/space/image_space.h" #include "gc/space/space-inl.h" #include "image_writer.h" +#include "interpreter/unstarted_runtime.h" #include "leb128.h" #include "mirror/art_method-inl.h" #include "mirror/class-inl.h" @@ -1541,8 +1542,14 @@ class Dex2Oat FINAL { } } runtime->GetClassLinker()->FixupDexCaches(runtime->GetResolutionMethod()); + + // Initialize maps for unstarted runtime. This needs to be here, as running clinits needs this + // set up. + interpreter::UnstartedRuntimeInitialize(); + runtime->GetClassLinker()->RunRootClinits(); runtime_ = runtime; + return true; } |