| commit | 4660ec71bfebd51800e9bdf535040c352b0471b9 | [log] [tgz] |
|---|---|---|
| author | Kelvin Zhang <zhangkelvin@google.com> | Tue Jul 27 21:00:46 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 27 21:00:46 2021 +0000 |
| tree | d6c1c43d01a2167e4097275f658395ade14a75ad | |
| parent | a3f77bcc2f72384463678ec0144b58dfaee3576c [diff] | |
| parent | b5f09960717c22c84cb555c55020bafb9343a694 [diff] |
Don't check for FEC offset if fec is disabled am: b5f0996071 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/update_engine/+/15401790 Change-Id: I10e1bb49f5a6db312548f328ce34df95e555d765
diff --git a/payload_consumer/filesystem_verifier_action.cc b/payload_consumer/filesystem_verifier_action.cc index 22c8e0b..8b39f6d 100644 --- a/payload_consumer/filesystem_verifier_action.cc +++ b/payload_consumer/filesystem_verifier_action.cc
@@ -358,8 +358,10 @@ offset_ = 0; filesystem_data_end_ = partition_size_; - CHECK_LE(partition.hash_tree_offset, partition.fec_offset) - << " Hash tree is expected to come before FEC data"; + if (partition.fec_offset > 0) { + CHECK_LE(partition.hash_tree_offset, partition.fec_offset) + << " Hash tree is expected to come before FEC data"; + } if (partition.hash_tree_offset != 0) { filesystem_data_end_ = partition.hash_tree_offset; } else if (partition.fec_offset != 0) {