diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-12-10 09:33:21 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-12-10 10:28:19 -0800 |
| commit | ceb07b3285eaab350a8cd12f7d74be3e40a255dd (patch) | |
| tree | 4d5f7c1ab47ea6b8399d2112b69a818a0519b2de /patchoat | |
| parent | 836ee764c86892aff1dca6b0f8b27e32c7374cc7 (diff) | |
| download | art-ceb07b3285eaab350a8cd12f7d74be3e40a255dd.tar.gz art-ceb07b3285eaab350a8cd12f7d74be3e40a255dd.tar.bz2 art-ceb07b3285eaab350a8cd12f7d74be3e40a255dd.zip | |
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 'patchoat')
| -rw-r--r-- | patchoat/patchoat.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/patchoat/patchoat.cc b/patchoat/patchoat.cc index 723bb1762d..46ab34bea3 100644 --- a/patchoat/patchoat.cc +++ b/patchoat/patchoat.cc @@ -153,6 +153,12 @@ bool PatchOat::Patch(const std::string& image_location, off_t delta, return false; } + if (image_header.GetStorageMode() != ImageHeader::kStorageModeUncompressed) { + LOG(ERROR) << "Patchoat is not supported with compressed image files " + << input_image->GetPath(); + return false; + } + /*bool is_image_pic = */IsImagePic(image_header, input_image->GetPath()); // Nothing special to do right now since the image always needs to get patched. // Perhaps in some far-off future we may have images with relative addresses that are true-PIC. |