commit 28db0129e5d7ef642cf8845c86c0e11832817085
author Brian Carlstrom <bdc@google.com> Thu Oct 18 16:20:41 2012 -0700
committer Brian Carlstrom <bdc@google.com> Thu Oct 18 22:26:03 2012 -0700
tree 3f1ca5abeb2e622e193573165bf20a626447337e
parent a85b8376740641f13dc078aea6be94d15a800803

Add oat file dependency on boot.oat load location

Change-Id: I89742e361675bd4e5177e3af213bcc826ddd60de

src/native/dalvik_system_DexFile.cc

diff --git a/src/native/dalvik_system_DexFile.cc b/src/native/dalvik_system_DexFile.cc
index 3ef5e5c..a55d7f1 100644
--- a/src/native/dalvik_system_DexFile.cc
+++ b/src/native/dalvik_system_DexFile.cc
@@ -244,10 +244,18 @@
     if ((*cur)->IsImageSpace()) {
       // TODO: Ensure this works with multiple image spaces.
       const ImageHeader& image_header = (*cur)->AsImageSpace()->GetImageHeader();
-      if (oat_file->GetOatHeader().GetImageFileLocationChecksum() != image_header.GetOatChecksum()) {
+      if (oat_file->GetOatHeader().GetImageFileLocationOatChecksum() != image_header.GetOatChecksum()) {
         ScopedObjectAccess soa(env);
         LOG(INFO) << "DexFile_isDexOptNeeded cache file " << cache_location
-                  << " has out-of-date checksum compared to "
+                  << " has out-of-date oat checksum compared to "
+                  << image_header.GetImageRoot(ImageHeader::kOatLocation)->AsString()->ToModifiedUtf8();
+        return JNI_TRUE;
+      }
+      if (oat_file->GetOatHeader().GetImageFileLocationOatBegin()
+          != reinterpret_cast<uint32_t>(image_header.GetOatBegin())) {
+        ScopedObjectAccess soa(env);
+        LOG(INFO) << "DexFile_isDexOptNeeded cache file " << cache_location
+                  << " has out-of-date oat begin compared to "
                   << image_header.GetImageRoot(ImageHeader::kOatLocation)->AsString()->ToModifiedUtf8();
         return JNI_TRUE;
       }