Use the right alignof when mapping an uncompressed dex file.

We should use the header alignment, not the dex file alignment.

Test: odrefresh --force-compile; /proc/$(pidof dex2oat64)/maps |grep extracted
Bug: 217955940
Change-Id: I6827d4c4cd133874810ff5463686c330392f5f7b

1 files changed, 4 insertions, 1 deletions

diff --git a/dex2oat/linker/oat_writer.cc b/dex2oat/linker/oat_writer.cc
index eccc3d52c1..229322c08c 100644
--- a/dex2oat/linker/oat_writer.cc
+++ b/dex2oat/linker/oat_writer.cc
@@ -3490,7 +3490,10 @@ bool OatWriter::OpenDexFiles(
     for (OatDexFile& oat_dex_file : oat_dex_files_) {
       std::string error_msg;
       maps.emplace_back(oat_dex_file.source_.GetZipEntry()->MapDirectlyOrExtract(
-          oat_dex_file.dex_file_location_data_, "zipped dex", &error_msg, alignof(DexFile)));
+          oat_dex_file.dex_file_location_data_,
+          "zipped dex",
+          &error_msg,
+          alignof(DexFile::Header)));
       MemMap* map = &maps.back();
       if (!map->IsValid()) {
         LOG(ERROR) << error_msg;