commit 6a7b8d155776d8e06587a4ddda7e80f464ae1943
author android-build-team Robot <android-build-team-robot@google.com> Mon Jul 03 07:35:29 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Jul 03 07:35:29 2017 +0000
tree 9bcc5e5583f18817c8c687564155e4c93ab15d3a
parent 634fffd1320fa8387fdf2eeae3cd2567688a2d90
parent 1b2f7a64e229a870069bb2a6880557f3a4a76fc8

release-request-9336bb6f-90e7-478e-9d85-062ca3fdf6a3-for-git_oc-dr1-release-4152361 snap-temp-L91700000079439679

Change-Id: I63ecf453080f036f5e1583eb174585ffbf811123

avbtool

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