commit 0a112bbbcd761c749c346bfec0ec39c1ef37a590
author Alex Light <allight@google.com> Thu Aug 14 14:16:26 2014 -0700
committer Alex Light <allight@google.com> Tue Aug 19 15:09:38 2014 -0700
tree a502e7e6e51b895017d61f5a6def7dbdf4f6dd8c
parent 38bd1e1b8aa39bdc6e67c5dc205cc8d294d985c5

Make apps able to run with a failing patchoat

Bug: 17000769

(cherry picked from commit 9dcc4572949f6a8231a1b4ed859676ba6f411726)

Change-Id: I0a1a4dc7f5d4bb268530840302ecfb1555231e05

runtime/class_linker.h

diff --git a/runtime/class_linker.h b/runtime/class_linker.h
index 6fc0f0e..bd4a173 100644
--- a/runtime/class_linker.h
+++ b/runtime/class_linker.h
@@ -565,6 +565,10 @@
                                             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)
@@ -744,6 +748,7 @@
   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);