diff options
| author | Tianjie Xu <xunchang@google.com> | 2017-08-19 06:34:03 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-19 06:34:03 +0200 |
| commit | fc569d15163f95a5ef638e6904368ee42d1663d4 (patch) | |
| tree | fb822c27ac27eff397d8431b0d6026f457f8890a /updater | |
| parent | Merge "update_verifier now logs to kmesg" am: f7ad94313d am: 473606847a (diff) | |
| parent | Merge "Move Image/ImageChunk/PatchChunk declaration into header files" am: b4bc57ed39 (diff) | |
| download | android_bootable_recovery-fc569d15163f95a5ef638e6904368ee42d1663d4.tar android_bootable_recovery-fc569d15163f95a5ef638e6904368ee42d1663d4.tar.gz android_bootable_recovery-fc569d15163f95a5ef638e6904368ee42d1663d4.tar.bz2 android_bootable_recovery-fc569d15163f95a5ef638e6904368ee42d1663d4.tar.lz android_bootable_recovery-fc569d15163f95a5ef638e6904368ee42d1663d4.tar.xz android_bootable_recovery-fc569d15163f95a5ef638e6904368ee42d1663d4.tar.zst android_bootable_recovery-fc569d15163f95a5ef638e6904368ee42d1663d4.zip | |
Diffstat (limited to '')
| -rw-r--r-- | rangeset.h (renamed from updater/include/updater/rangeset.h) | 8 | ||||
| -rw-r--r-- | updater/blockimg.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/updater/include/updater/rangeset.h b/rangeset.h index b67c98724..f224a08be 100644 --- a/updater/include/updater/rangeset.h +++ b/rangeset.h @@ -266,13 +266,13 @@ class SortedRangeSet : public RangeSet { new_block_start += (old_block_start - range.first); return (new_block_start * kBlockSize + old_offset % kBlockSize); } else { - CHECK(false) <<"block_start " << old_block_start << " is missing between two ranges: " - << this->ToString(); + CHECK(false) << "block_start " << old_block_start + << " is missing between two ranges: " << this->ToString(); return 0; } } - CHECK(false) <<"block_start " << old_block_start << " exceeds the limit of current RangeSet: " - << this->ToString(); + CHECK(false) << "block_start " << old_block_start + << " exceeds the limit of current RangeSet: " << this->ToString(); return 0; } };
\ No newline at end of file diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp index a0b9ad233..fe21dd0eb 100644 --- a/updater/blockimg.cpp +++ b/updater/blockimg.cpp @@ -53,8 +53,8 @@ #include "error_code.h" #include "ota_io.h" #include "print_sha1.h" +#include "rangeset.h" #include "updater/install.h" -#include "updater/rangeset.h" #include "updater/updater.h" // Set this to 0 to interpret 'erase' transfers to mean do a |