commit e682d901f34050b9df4d7a519abf91eb6cd61a7b
author Mathieu Chartier <mathieuc@google.com> Thu Mar 02 09:49:03 2017 -0800
committer Mathieu Chartier <mathieuc@google.com> Thu Mar 02 10:11:35 2017 -0800
tree ebec8276fec464702fcc9ae08e4845d683718b5c
parent f040eca7329382d48dc2b8bfc228ee3f27c9f13d

Fixed OatWriter checksum for raw data case

The checksum from the dex file seems to be incorrect, use the one
from the OatDexFile since it matches the original dex checksum.

Regression test in follow up CL.

Test: test-art-host-gtest -j32

Bug: 35761072
Change-Id: I79f0e720c9a2fc33286c4d4c1ef4ab9d194533a9

compiler/oat_writer.cc

diff --git a/compiler/oat_writer.cc b/compiler/oat_writer.cc
index 34d2ec9..c5ec859 100644
--- a/compiler/oat_writer.cc
+++ b/compiler/oat_writer.cc
@@ -2283,7 +2283,7 @@
     dex_file = DexFile::Open(raw_dex_file,
                              header->file_size_,
                              location,
-                             header->checksum_,
+                             oat_dex_file->dex_file_location_checksum_,
                              nullptr,
                              /* verify */ true,
                              /* verify_checksum */ false,