diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-08-25 17:51:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-25 17:51:38 +0000 |
| commit | e25826e28ea65d9c1aa23f84788a091c677b20c7 (patch) | |
| tree | 0d89c7f23c5095907756a53ef8ebdaf92db0a48d /runtime/class_linker.h | |
| parent | 21259fedf4fd0f786c71f69493ebfbb9affe3a8d (diff) | |
| parent | 64ad14dbe2225441fb7734bf6d89358d96692eea (diff) | |
| download | art-e25826e28ea65d9c1aa23f84788a091c677b20c7.tar.gz art-e25826e28ea65d9c1aa23f84788a091c677b20c7.tar.bz2 art-e25826e28ea65d9c1aa23f84788a091c677b20c7.zip | |
Merge "Support running without a boot image."
Diffstat (limited to 'runtime/class_linker.h')
| -rw-r--r-- | runtime/class_linker.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index edcddcefd1..14a9e4ad1b 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -61,8 +61,8 @@ class ClassLinker { explicit ClassLinker(InternTable* intern_table); ~ClassLinker(); - // Initialize class linker by bootstraping from dex files - void InitFromCompiler(const std::vector<const DexFile*>& boot_class_path) + // Initialize class linker by bootstraping from dex files. + void InitWithoutImage(const std::vector<const DexFile*>& boot_class_path) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); // Initialize class linker from one or more images. |