Revert "ART: Key-Value Store in Oat header"
Broke arm64 build.
This reverts commit c87d27b25994da8670d82a8f7bad6327b693bfff.
Change-Id: I4c2ade295d2b5aa77fc3ad810e0e859629a5bf09
diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc
index 631d538..12970fc 100644
--- a/oatdump/oatdump.cc
+++ b/oatdump/oatdump.cc
@@ -171,18 +171,10 @@
os << "IMAGE FILE LOCATION OAT BEGIN:\n";
os << StringPrintf("0x%08x\n\n", oat_header.GetImageFileLocationOatDataBegin());
- // Print the key-value store.
- {
- os << "KEY VALUE STORE:\n";
- size_t index = 0;
- const char* key;
- const char* value;
- while (oat_header.GetStoreKeyValuePairByIndex(index, &key, &value)) {
- os << key << " = " << value << "\n";
- index++;
- }
- os << "\n";
- }
+ os << "IMAGE FILE LOCATION:\n";
+ const std::string image_file_location(oat_header.GetImageFileLocation());
+ os << image_file_location;
+ os << "\n\n";
os << "BEGIN:\n";
os << reinterpret_cast<const void*>(oat_file_.Begin()) << "\n\n";