| commit | 459464215e1a28bacc9f03f47ae4cb11495eb037 | [log] [tgz] |
|---|---|---|
| author | liuqiang <skywalker0507@gmail.com> | Wed Sep 25 20:24:40 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 25 20:24:40 2024 +0000 |
| tree | 4d1d901fb12787be13f59f63474dd4d6485e866f | |
| parent | f69c69b15863d2419493ce7a72127b85c6464e5f [diff] | |
| parent | cf8918b60bc35bf05f7c303585d53d5b7d8fbaa9 [diff] |
update_engine: uint64_t of partition size am: f1a360beb5 am: cf8918b60b Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/3280978 Change-Id: Ic33d42ed5248b674876e847a66cde0a2039f32ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/payload_consumer/filesystem_verifier_action.cc b/payload_consumer/filesystem_verifier_action.cc index 2e2f6b9..4990358 100644 --- a/payload_consumer/filesystem_verifier_action.cc +++ b/payload_consumer/filesystem_verifier_action.cc
@@ -112,7 +112,7 @@ std::partial_sum(partition_weight_.begin(), partition_weight_.end(), partition_weight_.begin(), - std::plus<size_t>()); + std::plus<uint64_t>()); install_plan_.Dump(); // If we are not writing verity, just map all partitions once at the
diff --git a/payload_consumer/filesystem_verifier_action.h b/payload_consumer/filesystem_verifier_action.h index d8cb902..2adf62e 100644 --- a/payload_consumer/filesystem_verifier_action.h +++ b/payload_consumer/filesystem_verifier_action.h
@@ -176,7 +176,7 @@ // Cumulative sum of partition sizes. Used for progress report. // This vector will always start with 0, and end with total size of all // partitions. - std::vector<size_t> partition_weight_; + std::vector<uint64_t> partition_weight_; DISALLOW_COPY_AND_ASSIGN(FilesystemVerifierAction); };