diff options
| author | 2015-12-10 09:33:21 -0800 | |
|---|---|---|
| committer | 2015-12-10 10:28:19 -0800 | |
| commit | ceb07b3285eaab350a8cd12f7d74be3e40a255dd (patch) | |
| tree | 4d5f7c1ab47ea6b8399d2112b69a818a0519b2de /runtime/image.cc | |
| parent | 836ee764c86892aff1dca6b0f8b27e32c7374cc7 (diff) | |
Revert "Revert "Add support for LZ4 compressed image files""
Needed to call compiler_driver_->SetSupportBootImageFixup(false).
Bug: 22858531
This reverts commit 83d4d72aa0e4170209ab50c67ba22e46b71352c1.
Change-Id: Iaed6a810a0c088f1f2c57cf2f12087f3978a3de1
Diffstat (limited to 'runtime/image.cc')
| -rw-r--r-- | runtime/image.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/runtime/image.cc b/runtime/image.cc index 2eac3fb873..7d2ef75c06 100644 --- a/runtime/image.cc +++ b/runtime/image.cc @@ -24,7 +24,7 @@ namespace art { const uint8_t ImageHeader::kImageMagic[] = { 'a', 'r', 't', '\n' }; -const uint8_t ImageHeader::kImageVersion[] = { '0', '2', '3', '\0' }; +const uint8_t ImageHeader::kImageVersion[] = { '0', '2', '4', '\0' }; ImageHeader::ImageHeader(uint32_t image_begin, uint32_t image_size, @@ -36,7 +36,9 @@ ImageHeader::ImageHeader(uint32_t image_begin, uint32_t oat_data_end, uint32_t oat_file_end, uint32_t pointer_size, - bool compile_pic) + bool compile_pic, + StorageMode storage_mode, + size_t data_size) : image_begin_(image_begin), image_size_(image_size), oat_checksum_(oat_checksum), @@ -47,7 +49,9 @@ ImageHeader::ImageHeader(uint32_t image_begin, patch_delta_(0), image_roots_(image_roots), pointer_size_(pointer_size), - compile_pic_(compile_pic) { + compile_pic_(compile_pic), + storage_mode_(storage_mode), + data_size_(data_size) { CHECK_EQ(image_begin, RoundUp(image_begin, kPageSize)); CHECK_EQ(oat_file_begin, RoundUp(oat_file_begin, kPageSize)); CHECK_EQ(oat_data_begin, RoundUp(oat_data_begin, kPageSize)); |