commit 26f0c1a3eeeca9e7dbe9f22748d93c05049ff2ee
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jul 28 01:10:04 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jul 28 01:10:04 2021 +0000
tree d6c1c43d01a2167e4097275f658395ade14a75ad
parent 4aa1ab688efae9b161745ce6c0f5da49544d72fc
parent b5f09960717c22c84cb555c55020bafb9343a694

Snap for 7588338 from b5f09960717c22c84cb555c55020bafb9343a694 to sc-release

Change-Id: Id04d87fa9134205889d29a358c91e2e7e583f9b4

payload_consumer/filesystem_verifier_action.cc

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) {