commit e4bffe6ddb0d2107d0f5cb1d9a0af3892a331fbc
author Kelvin Zhang <zhangkelvin@google.com> Mon Mar 07 09:08:38 2022 -0800
committer Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 08 00:25:10 2022 +0000
tree 4da64ba11185fb967eec028b4a58f76a49c7ac9e
parent ee60fd4d6f6b9028f832b31e44fe3d2b15f8ae5b

Fix crash when hash tree isn't enabled but verity is

Test: th
Bug: 223110157
Change-Id: Idd254fb484ffabb3162e1f3232739cc29e00d51e

Android.bp

diff --git a/Android.bp b/Android.bp
index 5df8444..cc3cd09 100644
--- a/Android.bp
+++ b/Android.bp
@@ -869,6 +869,8 @@
         "payload_generator/payload_signer_unittest.cc",
         "payload_generator/squashfs_filesystem_unittest.cc",
         "payload_generator/zip_unittest.cc",
+        "payload_consumer/verity_writer_android_unittest.cc",
+        "payload_consumer/xz_extent_writer_unittest.cc",
         "testrunner.cc",
     ],
 }
@@ -991,9 +993,7 @@
         "payload_consumer/postinstall_runner_action_unittest.cc",
         "payload_consumer/snapshot_extent_writer_unittest.cc",
         "payload_consumer/vabc_partition_writer_unittest.cc",
-        "payload_consumer/verity_writer_android_unittest.cc",
         "payload_consumer/xor_extent_writer_unittest.cc",
-        "payload_consumer/xz_extent_writer_unittest.cc",
         "update_status_utils_unittest.cc",
     ],
 }