aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-08-14 05:23:52 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-08-14 05:23:52 +0000
commit0d771f6db9df8f32742a356b3da3a1d57636dd5c (patch)
treed6c1c43d01a2167e4097275f658395ade14a75ad
parent5d3a1e71fac88f33ebcf7f799a621b043db6c830 (diff)
parent4660ec71bfebd51800e9bdf535040c352b0471b9 (diff)
downloadupdate_engine-0d771f6db9df8f32742a356b3da3a1d57636dd5c.tar.gz
Snap for 7642458 from 4660ec71bfebd51800e9bdf535040c352b0471b9 to mainline-os-statsd-releaseandroid-mainline-12.0.0_r84android-mainline-12.0.0_r58android12-mainline-statsd-release
Change-Id: I498a9e28438bc16e823fc4c1966737cf2340e8d1
-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) {