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

compiler/oat_test.cc

diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc
index 74b5da9..bfba9c0 100644
--- a/compiler/oat_test.cc
+++ b/compiler/oat_test.cc
@@ -110,7 +110,9 @@
   ASSERT_EQ("lue.art", oat_header.GetImageFileLocation());
 
   const DexFile* dex_file = java_lang_dex_file_;
-  const OatFile::OatDexFile* oat_dex_file = oat_file->GetOatDexFile(dex_file->GetLocation());
+  uint32_t dex_file_checksum = dex_file->GetLocationChecksum();
+  const OatFile::OatDexFile* oat_dex_file = oat_file->GetOatDexFile(dex_file->GetLocation(),
+                                                                    &dex_file_checksum);
   CHECK_EQ(dex_file->GetLocationChecksum(), oat_dex_file->GetDexFileLocationChecksum());
   for (size_t i = 0; i < dex_file->NumClassDefs(); i++) {
     const DexFile::ClassDef& class_def = dex_file->GetClassDef(i);