commit e3359f7ad7671c5816f17145ca3a01516512e8d6
author Ian Rogers <irogers@google.com> Tue Jun 11 15:14:11 2013 -0700
committer Ian Rogers <irogers@google.com> Tue Jun 11 15:14:11 2013 -0700
tree bfb5a78fb6c42ea5fc93638d6aaa82fdf7a201a6
parent 62342ec720069cebe55f45aea2ff8512a17e7d62

Don't recursively take ClassLinker::dex_lock_.

Fix for Bug: 9285048.

Change-Id: I4bdefdc7e1de2eec6488e8d629147d9699f4d099

src/class_linker.h

diff --git a/src/class_linker.h b/src/class_linker.h
index eab1fcc..e0f297d 100644
--- a/src/class_linker.h
+++ b/src/class_linker.h
@@ -500,6 +500,12 @@
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_, dex_lock_);
   const OatFile* FindOpenedOatFileFromOatLocation(const std::string& oat_location)
       SHARED_LOCKS_REQUIRED(dex_lock_);
+  const DexFile* FindDexFileInOatLocation(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_);
+
   const DexFile* VerifyAndOpenDexFileFromOatFile(const OatFile* oat_file,
                                                  const std::string& dex_location,
                                                  uint32_t dex_location_checksum)