commit 265091e581c9f643b37e7966890911f09e223269
author Brian Carlstrom <bdc@google.com> Wed Jan 30 14:08:26 2013 -0800
committer Brian Carlstrom <bdc@google.com> Wed Mar 06 14:08:46 2013 -0800
tree ae493ce6c3537aebc3a85f59a73500fa819a7baf
parent 4c1c283a7410784e9cab309f868248690b788a9c

Remove ExtractCodeAndPrelink and switch Portable to MCLinker

Change-Id: Ia2459c7da6b79e0a1c0f1148c6e28ad9cbbe27a2

src/oat_file.h

diff --git a/src/oat_file.h b/src/oat_file.h
index 8efdf9f..4aa18ba 100644
--- a/src/oat_file.h
+++ b/src/oat_file.h
@@ -46,14 +46,15 @@
                        byte* requested_base);
 
   // Open an oat file from an already opened File.
-  static OatFile* Open(File* file,
-                       const std::string& location,
-                       byte* requested_base,
-                       bool writable);
+  // Does not use dlopen underneath so cannot be used for runtime use
+  // where relocations may be required. Currently used from
+  // ImageWriter which wants to open a writable version from an existing
+  // file descriptor for patching.
+  static OatFile* OpenWritable(File* file, const std::string& location);
 
   // Open an oat file backed by a std::vector with the given location.
-  static OatFile* Open(std::vector<uint8_t>& oat_contents,
-                       const std::string& location);
+  static OatFile* OpenMemory(std::vector<uint8_t>& oat_contents,
+                             const std::string& location);
 
   ~OatFile();
 
@@ -67,11 +68,7 @@
 
   class OatMethod {
    public:
-    // Link Method for execution using the contents of this OatMethod
-    void LinkMethodPointers(mirror::AbstractMethod* method) const;
-
-    // Link Method for image writing using the contents of this OatMethod
-    void LinkMethodOffsets(mirror::AbstractMethod* method) const;
+    void LinkMethod(mirror::AbstractMethod* method) const;
 
     uint32_t GetCodeOffset() const {
       return code_offset_;