commit 8794414821e5e1c8c40d8483295a030c52d976bc
author David Zeuthen <zeuthen@google.com> Wed May 31 14:27:33 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 31 14:27:33 2017 +0000
tree 1bdb9adc9f00938e24183fd7aef4392f8a96b825
parent 7cc278d263559aee21d938cb321a845bfd77c1dc
parent 9803f2739e3a2cca8a8edf67c25649ef38aa83bb

avbtool: verify_image: Verify hash-, hashtree, and chain-descriptors. am: 5dfb4e9999 am: 4c3125a6ea am: 8aef401cdd
am: 9803f2739e

Change-Id: I97aaf8089a22a88e4afb06c86f044d89584442aa

avbtool

diff --git a/avbtool b/avbtool
index 5df31b4..1a97ea4 100755
--- a/avbtool
+++ b/avbtool
@@ -2271,7 +2271,7 @@
     c += ' {}'.format(str(ht.salt).encode('hex'))  # salt
     if ht.fec_num_roots > 0:
       c += ' 10'  # number of optional args
-      c += ' $(ANDROID_VERITY_MODE)'
+      c += ' restart_on_corruption'
       c += ' ignore_zero_blocks'
       c += ' use_fec_from_device PARTUUID=$(ANDROID_SYSTEM_PARTUUID)'
       c += ' fec_roots {}'.format(ht.fec_num_roots)
@@ -2282,7 +2282,7 @@
       c += ' fec_start {}'.format(ht.fec_offset/ht.data_block_size)
     else:
       c += ' 2'  # number of optional args
-      c += ' $(ANDROID_VERITY_MODE)'
+      c += ' restart_on_corruption'
       c += ' ignore_zero_blocks'
     c += '" root=/dev/dm-0'