| commit | 792cacbc6d663a9b821927cb416c98a4b73eac66 | [log] [tgz] |
|---|---|---|
| author | Kelvin Zhang <zhangkelvin@google.com> | Tue Jul 27 04:09:01 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 27 04:09:01 2021 +0000 |
| tree | 9a8a9c5b387d0e13ecb48ffc68eebcaf61a6b4fa | |
| parent | cc2fd47f4eb8fa3309555095c56633144c7c8fd0 [diff] | |
| parent | 8511c4c1b714a7e8318566f0851f7053c7123df3 [diff] |
Don't check for FEC offset if fec is disabled am: 5e5ad39a15 am: 8511c4c1b7 Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1779068 Change-Id: I6a5430bb46e22df1a6d44021d0c83a3417e39d4d
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) {