diff options
| author | Amin Hassani <ahassani@google.com> | 2017-12-06 13:47:52 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-12-12 13:50:58 -0800 |
| commit | d8b67f49d7f8ae291cd4fa901b2d3767137704e7 (patch) | |
| tree | 2d039015afcd03433da0dd8860a83ce3ce2a65cf /payload_generator/extent_ranges.cc | |
| parent | 06c6d088b89656a120d40c4b578200c87af5c4c8 (diff) | |
update_engine: Remove the duplicate BlocksInExtents
This patch removes the duplicate BlocksInExtents from extent_utils.h and fixes
the remainder of the code to reflect this change.
BUG=none
TEST=unittests pass;
Change-Id: I76f5106f75072b20cd8f41f081b2f2b07aeac9a8
Reviewed-on: https://chromium-review.googlesource.com/812009
Commit-Ready: Amin Hassani <ahassani@chromium.org>
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Alex Deymo <deymo@google.com>
Reviewed-by: Sen Jiang <senj@chromium.org>
Diffstat (limited to 'payload_generator/extent_ranges.cc')
| -rw-r--r-- | payload_generator/extent_ranges.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/payload_generator/extent_ranges.cc b/payload_generator/extent_ranges.cc index 0e0cdf7a..c1d3d638 100644 --- a/payload_generator/extent_ranges.cc +++ b/payload_generator/extent_ranges.cc @@ -23,6 +23,7 @@ #include <base/logging.h> +#include "update_engine/common/utils.h" #include "update_engine/payload_consumer/payload_constants.h" #include "update_engine/payload_generator/extent_utils.h" @@ -250,7 +251,7 @@ vector<Extent> ExtentRanges::GetExtentsForBlockCount( out.back().set_num_blocks(blocks_needed); break; } - CHECK(out_blocks == BlocksInExtents(out)); + CHECK(out_blocks == utils::BlocksInExtents(out)); return out; } |