diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-02 21:56:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-02 21:56:43 +0000 |
| commit | 8be98142ecdba40b2ea9be10b11a23f4e6b67b05 (patch) | |
| tree | 0a310ca653ef73c547d80da63c87fcb2c0636bcb /patch_writer.cc | |
| parent | b77318bc7ecfba25e4966b56b9e9ab593925ad9d (diff) | |
| parent | 7be427590935bc88198d32004449ccfcf60b60d4 (diff) | |
| download | zucchini-8be98142ecdba40b2ea9be10b11a23f4e6b67b05.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main' into dev am: a90c04389f am: ddc43dc959 am: d9eed84a58 am: 58b4d19a6b am: 7be4275909
Original change: https://android-review.googlesource.com/c/platform/external/zucchini/+/1877854
Change-Id: Ifdb1f7882cc237258a3395d28158d50bb4b43136
Diffstat (limited to 'patch_writer.cc')
| -rw-r--r-- | patch_writer.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/patch_writer.cc b/patch_writer.cc index 1206208..04f3244 100644 --- a/patch_writer.cc +++ b/patch_writer.cc @@ -10,6 +10,7 @@ #include "base/numerics/checked_math.h" #include "base/numerics/safe_conversions.h" #include "components/zucchini/crc32.h" +#include "components/zucchini/element_detection.h" namespace zucchini { @@ -30,6 +31,7 @@ bool SerializeElementMatch(const ElementMatch& element_match, element_header.new_length = base::checked_cast<uint32_t>(element_match.new_element.size); element_header.exe_type = element_match.exe_type(); + element_header.version = DisassemblerVersionOfType(element_match.exe_type()); return sink->PutValue<PatchElementHeader>(element_header); } @@ -248,11 +250,15 @@ EnsemblePatchWriter::~EnsemblePatchWriter() = default; EnsemblePatchWriter::EnsemblePatchWriter(const PatchHeader& header) : header_(header) { DCHECK_EQ(header_.magic, PatchHeader::kMagic); + DCHECK_EQ(header_.major_version, kMajorVersion); + DCHECK_EQ(header_.minor_version, kMinorVersion); } EnsemblePatchWriter::EnsemblePatchWriter(ConstBufferView old_image, ConstBufferView new_image) { header_.magic = PatchHeader::kMagic; + header_.major_version = kMajorVersion; + header_.minor_version = kMinorVersion; header_.old_size = base::checked_cast<uint32_t>(old_image.size()); header_.old_crc = CalculateCrc32(old_image.begin(), old_image.end()); header_.new_size = base::checked_cast<uint32_t>(new_image.size()); |