summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-08-09 10:08:26 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-08-09 10:08:26 +0000
commit662dc0fa68be413ffc51a9261da633f23a6235df (patch)
treed6c1c43d01a2167e4097275f658395ade14a75ad
parent6fd8fc1f60c58ac9d2639bd4cacb69afc168de62 (diff)
parentfbf541b0d9c1680de6b8d2d9a1c5d9bc10723a36 (diff)
Snap for 7623707 from fbf541b0d9c1680de6b8d2d9a1c5d9bc10723a36 to s-keystone-qcom-release
Change-Id: I5641a490a3ca0510e3139492f8f127be3e0eb79a
-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) {