commit 961e316223fbf35431a98b7bdce4d6382339cf35
author Geremy Condra <gcondra@google.com> Mon May 19 17:20:24 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 19 17:20:24 2014 +0000
tree ef737cb9713ad2fefc79e2536933693758f62bad
parent 8d422a3a0b61e02f4e65f9a762fd2f55e7dc8862
parent e8e982afd31934a499c8551af7c19b85a31d63b2

Merge "Fix salt for verity tree generation."

tools/releasetools/build_image.py

diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py
index 4ad5bca..0bbdddc 100755
--- a/tools/releasetools/build_image.py
+++ b/tools/releasetools/build_image.py
@@ -30,6 +30,8 @@
 
 import simg_map
 
+FIXED_SALT = "aee087a5be3b982978c923f566a94613496b417f2af592639bc80d141e34dfe7"
+
 def RunCommand(cmd):
   """ Echo and run the given command
 
@@ -79,7 +81,7 @@
   return partition_size - verity_tree_size - verity_metadata_size
 
 def BuildVerityTree(sparse_image_path, verity_image_path, prop_dict):
-  cmd = ("build_verity_tree %s %s" % (sparse_image_path, verity_image_path))
+  cmd = ("build_verity_tree -A %s %s %s" % (FIXED_SALT, sparse_image_path, verity_image_path))
   print cmd
   status, output = commands.getstatusoutput(cmd)
   if status: