commit | 5c4b29f4326c99b630aab73da4e24400792c76c5 | [log] [tgz] |
---|---|---|
author | Kelvin Zhang <zhangkelvin@google.com> | Fri Sep 22 20:51:00 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 20:51:00 2023 +0000 |
tree | 434e421d3a26cce9146cd7b473a471b51c685f2c | |
parent | e05670e680ff3d23a9d86e56524ba2d26165ec18 [diff] | |
parent | 316e7c01c1eb374319e61371b7a474a4199920f2 [diff] |
Ensure partitions are at least 1 block in size am: 316e7c01c1 Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2759626 Change-Id: I859393051397d810c762adc47d7c998263acf5b1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/payload_generator/generate_delta_main.cc b/payload_generator/generate_delta_main.cc index 5f0c9d2..9afa805 100644 --- a/payload_generator/generate_delta_main.cc +++ b/payload_generator/generate_delta_main.cc
@@ -470,7 +470,7 @@ if (part.path.empty()) { continue; } - const auto size = utils::FileSize(part.path); + const auto size = std::max<size_t>(utils::FileSize(part.path), kBlockSize); if (size % kBlockSize != 0) { const auto err = truncate(part.path.c_str(), size / kBlockSize * kBlockSize);