commit bc26b72a96c6e67a30d819506d643cb259886030
author Richard Uhler <ruhler@google.com> Fri Mar 10 14:27:10 2017 +0000
committer Richard Uhler <ruhler@google.com> Mon Mar 13 16:10:32 2017 +0000
tree 7e84ce42ecb0d560b3ad3f44d7d4bcc5c7e1745a
parent 96c4715d5ce952999f066ec74ecc8609a0856733

Make image oat checksum depend on secondary images.

Rather than explicitly having to load and combine the checksums from
secondary images in the case of multi-image, have the image oat
checksum for the primary image depend on the contents of all the
images.

Bug: 35659889
Bug: 34385298
Bug: 35992406

Test: test-art-host
Test: Manually add field to ZygoteInit, update boot image, verify image
      is properly relocated and used on device.
Change-Id: I38bd957d165682edabd0fd1874e8ef7acf923deb

runtime/dexopt_test.cc

diff --git a/runtime/dexopt_test.cc b/runtime/dexopt_test.cc
index 5167869..db65e40 100644
--- a/runtime/dexopt_test.cc
+++ b/runtime/dexopt_test.cc
@@ -111,7 +111,7 @@
                                                  &error_msg));
   ASSERT_TRUE(image_header != nullptr) << error_msg;
   const OatHeader& oat_header = odex_file->GetOatHeader();
-  uint32_t combined_checksum = OatFileAssistant::CalculateCombinedImageChecksum();
+  uint32_t combined_checksum = image_header->GetOatChecksum();
 
   if (CompilerFilter::DependsOnImageChecksum(filter)) {
     if (with_alternate_image) {