diff options
| author | Amin Hassani <ahassani@google.com> | 2017-09-06 12:41:23 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-09-25 15:52:39 -0700 |
| commit | db56be971d5c1adb405858e24ca772b5f3290099 (patch) | |
| tree | 79107907bdf797fcf1550e238410be4b04687c18 /payload_consumer/file_descriptor_utils_unittest.cc | |
| parent | ee6d9a1067175ab94de080feaf4db937eda43442 (diff) | |
update_engine: Use ExtentReader
Updates CopyAndHashExtents to use the new ExtentReader.
Adds CalculateAndValidatffeSourceHash() to DeltaPerformer to be used in both
SOURCE_BSDIFF and PUFFDIFF.
BUG=chromium:761138
TEST=FEATURES="test" emerge-amd64-generic update_engine; brillo_update_payload verify
Change-Id: I2e0c10fe0078c5a1ab4cd646a91d42893b6b691b
Reviewed-on: https://chromium-review.googlesource.com/653478
Commit-Ready: Amin Hassani <ahassani@chromium.org>
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Sen Jiang <senj@chromium.org>
Diffstat (limited to 'payload_consumer/file_descriptor_utils_unittest.cc')
| -rw-r--r-- | payload_consumer/file_descriptor_utils_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/payload_consumer/file_descriptor_utils_unittest.cc b/payload_consumer/file_descriptor_utils_unittest.cc index 42bdf176..8ba8ce69 100644 --- a/payload_consumer/file_descriptor_utils_unittest.cc +++ b/payload_consumer/file_descriptor_utils_unittest.cc @@ -32,13 +32,15 @@ #include "update_engine/payload_consumer/file_descriptor.h" #include "update_engine/payload_generator/extent_ranges.h" +using google::protobuf::RepeatedPtrField; + namespace chromeos_update_engine { namespace { -::google::protobuf::RepeatedPtrField<Extent> CreateExtentList( +RepeatedPtrField<Extent> CreateExtentList( const std::vector<std::pair<uint64_t, uint64_t>>& lst) { - ::google::protobuf::RepeatedPtrField<Extent> result; + RepeatedPtrField<Extent> result; for (const auto& item : lst) { *result.Add() = ExtentForRange(item.first, item.second); } |