diff options
| author | Alex Light <allight@google.com> | 2014-08-14 14:16:26 -0700 |
|---|---|---|
| committer | Alex Light <allight@google.com> | 2014-08-19 14:07:49 -0700 |
| commit | 9dcc4572949f6a8231a1b4ed859676ba6f411726 (patch) | |
| tree | 127ad110c7bd5fa865de2dd64e8658e73d95ddc0 /runtime/class_linker.h | |
| parent | 57101be6db093d9d27776f77eb8880ae5bae9913 (diff) | |
| download | art-9dcc4572949f6a8231a1b4ed859676ba6f411726.zip art-9dcc4572949f6a8231a1b4ed859676ba6f411726.tar.gz art-9dcc4572949f6a8231a1b4ed859676ba6f411726.tar.bz2 | |
Make apps able to run with a failing patchoat
Bug: 17000769
Change-Id: I0a1a4dc7f5d4bb268530840302ecfb1555231e05
Diffstat (limited to 'runtime/class_linker.h')
| -rw-r--r-- | runtime/class_linker.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index 9ae3862..5694149 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -573,6 +573,10 @@ class ClassLinker { std::vector<std::string>* error_msg) LOCKS_EXCLUDED(dex_lock_, Locks::mutator_lock_); + const OatFile* GetInterpretedOnlyOat(const std::string& oat_path, + InstructionSet isa, + std::string* error_msg); + const OatFile* PatchAndRetrieveOat(const std::string& input, const std::string& output, const std::string& image_location, InstructionSet isa, std::string* error_msg) @@ -752,6 +756,7 @@ class ClassLinker { friend class ImageDumper; // for FindOpenedOatFileFromOatLocation friend class ElfPatcher; // for FindOpenedOatFileForDexFile & FindOpenedOatFileFromOatLocation friend class NoDex2OatTest; // for FindOpenedOatFileForDexFile + friend class NoPatchoatTest; // for FindOpenedOatFileForDexFile FRIEND_TEST(ClassLinkerTest, ClassRootDescriptors); FRIEND_TEST(mirror::DexCacheTest, Open); FRIEND_TEST(ExceptionTest, FindExceptionHandler); |