summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-07-28 01:10:22 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-07-28 01:10:22 +0000
commit7ba45459322a184bd45afc8107d2f3a141f94ee8 (patch)
treed6c1c43d01a2167e4097275f658395ade14a75ad
parentc7a366d1719283a01825224d2f7f216838dc3aa0 (diff)
parentb5f09960717c22c84cb555c55020bafb9343a694 (diff)
Snap for 7588338 from b5f09960717c22c84cb555c55020bafb9343a694 to sc-d1-release
Change-Id: I6cf1c57ce4f70feaef4afc128a8d1d99ef17be7b
-rw-r--r--payload_consumer/filesystem_verifier_action.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/payload_consumer/filesystem_verifier_action.cc b/payload_consumer/filesystem_verifier_action.cc
index 22c8e0bd..8b39f6d0 100644
--- a/payload_consumer/filesystem_verifier_action.cc
+++ b/payload_consumer/filesystem_verifier_action.cc
@@ -358,8 +358,10 @@ void FilesystemVerifierAction::StartPartitionHashing() {
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) {