commit 8a8103513dea5c47037200beabad2a307f09ecc8
author David Zeuthen <zeuthen@google.com> Fri Jun 30 16:08:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 30 16:08:03 2017 +0000
tree be00bb3db1b56382f0abd92305c92694a4a5d130
parent 2ee8dbe2dbbe0b20c9c0023137997b41828fdb61
parent 852858e2edb5707305310910a507cad33478ec4e

Revert "avbtool: Avoid using $(ANDROID_VERITY_MODE) for now." am: 1b2f7a64e2
am: 852858e2ed

Change-Id: I32c002f25e0394a0873605e93a498c10f5a9d565

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'