diff options
author | Nicolas Geoffray <ngeoffray@google.com> | 2014-07-09 07:58:10 +0000 |
---|---|---|
committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-07-09 07:58:10 +0000 |
commit | 452bee5da9811f62123978e142bd67b385e9ff82 (patch) | |
tree | 3da88d3fb1bd2a03897aaac8bb015c12796d2cdf /runtime/oat.h | |
parent | c87d27b25994da8670d82a8f7bad6327b693bfff (diff) | |
download | art-452bee5da9811f62123978e142bd67b385e9ff82.zip art-452bee5da9811f62123978e142bd67b385e9ff82.tar.gz art-452bee5da9811f62123978e142bd67b385e9ff82.tar.bz2 |
Revert "ART: Key-Value Store in Oat header"
Broke arm64 build.
This reverts commit c87d27b25994da8670d82a8f7bad6327b693bfff.
Change-Id: I4c2ade295d2b5aa77fc3ad810e0e859629a5bf09
Diffstat (limited to 'runtime/oat.h')
-rw-r--r-- | runtime/oat.h | 42 |
1 files changed, 12 insertions, 30 deletions
diff --git a/runtime/oat.h b/runtime/oat.h index fbed596..7be768c 100644 --- a/runtime/oat.h +++ b/runtime/oat.h @@ -23,7 +23,6 @@ #include "dex_file.h" #include "instruction_set.h" #include "quick/quick_method_frame_info.h" -#include "safe_map.h" namespace art { @@ -32,16 +31,13 @@ class PACKED(4) OatHeader { static const uint8_t kOatMagic[4]; static const uint8_t kOatVersion[4]; - static constexpr const char* kImageLocationKey = "image-location"; - static constexpr const char* kDex2OatCmdLineKey = "dex2oat-cmdline"; - static constexpr const char* kDex2OatHostKey = "dex2oat-host"; - - static OatHeader* Create(InstructionSet instruction_set, - const InstructionSetFeatures& instruction_set_features, - const std::vector<const DexFile*>* dex_files, - uint32_t image_file_location_oat_checksum, - uint32_t image_file_location_oat_data_begin, - const SafeMap<std::string, std::string>* variable_data); + OatHeader(); + OatHeader(InstructionSet instruction_set, + const InstructionSetFeatures& instruction_set_features, + const std::vector<const DexFile*>* dex_files, + uint32_t image_file_location_oat_checksum, + uint32_t image_file_location_oat_data_begin, + const std::string& image_file_location); bool IsValid() const; const char* GetMagic() const; @@ -92,24 +88,11 @@ class PACKED(4) OatHeader { const InstructionSetFeatures& GetInstructionSetFeatures() const; uint32_t GetImageFileLocationOatChecksum() const; uint32_t GetImageFileLocationOatDataBegin() const; - - uint32_t GetKeyValueStoreSize() const; - const uint8_t* GetKeyValueStore() const; - const char* GetStoreValueByKey(const char* key) const; - bool GetStoreKeyValuePairByIndex(size_t index, const char** key, const char** value) const; - - size_t GetHeaderSize() const; + uint32_t GetImageFileLocationSize() const; + const uint8_t* GetImageFileLocationData() const; + std::string GetImageFileLocation() const; private: - OatHeader(InstructionSet instruction_set, - const InstructionSetFeatures& instruction_set_features, - const std::vector<const DexFile*>* dex_files, - uint32_t image_file_location_oat_checksum, - uint32_t image_file_location_oat_data_begin, - const SafeMap<std::string, std::string>* variable_data); - - void Flatten(const SafeMap<std::string, std::string>* variable_data); - uint8_t magic_[4]; uint8_t version_[4]; uint32_t adler32_checksum_; @@ -131,9 +114,8 @@ class PACKED(4) OatHeader { uint32_t image_file_location_oat_checksum_; uint32_t image_file_location_oat_data_begin_; - - uint32_t key_value_store_size_; - uint8_t key_value_store_[0]; // note variable width data at end + uint32_t image_file_location_size_; + uint8_t image_file_location_data_[0]; // note variable width data at end DISALLOW_COPY_AND_ASSIGN(OatHeader); }; |