commit 756ee4e090bc1e1812b41fb7b4661df601a32ef9
author Brian Carlstrom <bdc@google.com> Thu Oct 03 15:46:12 2013 -0700
committer Brian Carlstrom <bdc@google.com> Thu Oct 03 18:14:18 2013 -0700
tree b456ca4a582d5e75d20b418ab4c27ed56b46f40d
parent eeb9888421b696990f45b89286ad9d0908c70a69

Find OatDexFile by DexFile name and checksum, not just checksum

Bug: 10614658
Change-Id: Ie0b5a34fd396b6299000c37909108c5e7e6ab80f

runtime/class_linker.h

diff --git a/runtime/class_linker.h b/runtime/class_linker.h
index 3ffcf14..baeec66 100644
--- a/runtime/class_linker.h
+++ b/runtime/class_linker.h
@@ -258,17 +258,20 @@
   // it is missing or out of date. Returns the DexFile from within the
   // created oat file.
   const DexFile* FindOrCreateOatFileForDexLocation(const std::string& dex_location,
+                                                   uint32_t dex_location_checksum,
                                                    const std::string& oat_location)
       LOCKS_EXCLUDED(dex_lock_)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
   const DexFile* FindOrCreateOatFileForDexLocationLocked(const std::string& dex_location,
+                                                         uint32_t dex_location_checksum,
                                                          const std::string& oat_location)
       EXCLUSIVE_LOCKS_REQUIRED(dex_lock_)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
   // Find a DexFile within an OatFile given a DexFile location. Note
   // that this returns null if the location checksum of the DexFile
   // does not match the OatFile.
-  const DexFile* FindDexFileInOatFileFromDexLocation(const std::string& location)
+  const DexFile* FindDexFileInOatFileFromDexLocation(const std::string& location,
+                                                     uint32_t location_checksum)
       LOCKS_EXCLUDED(dex_lock_)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
@@ -494,7 +497,8 @@
   const OatFile* FindOpenedOatFileForDexFile(const DexFile& dex_file)
       LOCKS_EXCLUDED(dex_lock_)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
-  const OatFile* FindOpenedOatFileFromDexLocation(const std::string& dex_location)
+  const OatFile* FindOpenedOatFileFromDexLocation(const std::string& dex_location,
+                                                  uint32_t dex_location_checksum)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_, dex_lock_);
   const OatFile* FindOpenedOatFileFromOatLocation(const std::string& oat_location)
       SHARED_LOCKS_REQUIRED(dex_lock_);