Revert "Write shared data section for oatdump export dex"
This reverts commit fdca4cb565c25a4a05078b2afc3f7abb374309e3.
Reason for revert: CHECK failure in device testing (bad checksum).
(cherry picked from commit 4b670183dcc5173c19922b3f3d87c2fbddbb7a34)
Bug: 77469384
Merged-In: I43bd3ada4853022728d217ff8b79c32026fc4974
Change-Id: I27b29113fabcbafe2ddaac97511f55a4f5278c44
diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc
index c0d0478..e0ad1cc 100644
--- a/oatdump/oatdump.cc
+++ b/oatdump/oatdump.cc
@@ -1167,17 +1167,6 @@
}
}
- // Update header for shared section.
- uint32_t shared_section_offset = 0u;
- uint32_t shared_section_size = 0u;
- if (dex_file->IsCompactDexFile()) {
- CompactDexFile::Header* const header =
- reinterpret_cast<CompactDexFile::Header*>(const_cast<uint8_t*>(dex_file->Begin()));
- shared_section_offset = header->data_off_;
- shared_section_size = header->data_size_;
- // The shared section will be serialized right after the dex file.
- header->data_off_ = header->file_size_;
- }
// Verify output directory exists
if (!OS::DirectoryExists(options_.export_dex_location_)) {
// TODO: Extend OS::DirectoryExists if symlink support is required
@@ -1224,22 +1213,16 @@
return false;
}
- bool success = file->WriteFully(dex_file->Begin(), fsize);
+ bool success = false;
+ success = file->WriteFully(dex_file->Begin(), fsize);
+ // }
+
if (!success) {
os << "Failed to write dex file";
file->Erase();
return false;
}
- if (shared_section_size != 0) {
- success = file->WriteFully(dex_file->Begin() + shared_section_offset, shared_section_size);
- if (!success) {
- os << "Failed to write shared data section";
- file->Erase();
- return false;
- }
- }
-
if (file->FlushCloseOrErase() != 0) {
os << "Flush and close failed";
return false;