rebuild recovery patch in sign_target_files_apks
The target_files zip should now contain the recovery-from-boot patch
and the script to install it. This means that sign_target_files_apks,
which generates a signed target_files from an unsigned target_files,
now needs to recompute the patch and script (taking into account the
key replacement, property changes, etc., that it does) so its output
contains the correct patch.
Change-Id: I18afd73864ba5c480b7ec11de19d1f5e7763a8c0
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 6b8bf15..adbd32d 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -990,7 +990,8 @@
return cert
-def MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img):
+def MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img,
+ info_dict=None):
"""Generate a binary patch that creates the recovery image starting
with the boot image. (Most of the space in these images is just the
kernel, which is identical for the two, so the resulting patch
@@ -1003,6 +1004,9 @@
common.LoadInfoDict() on the input target_files.
"""
+ if info_dict is None:
+ info_dict = OPTIONS.info_dict
+
diff_program = ["imgdiff"]
path = os.path.join(input_dir, "SYSTEM", "etc", "recovery-resource.dat")
if os.path.exists(path):
@@ -1016,8 +1020,8 @@
_, _, patch = d.ComputePatch()
output_sink("recovery-from-boot.p", patch)
- boot_type, boot_device = GetTypeAndDevice("/boot", OPTIONS.info_dict)
- recovery_type, recovery_device = GetTypeAndDevice("/recovery", OPTIONS.info_dict)
+ boot_type, boot_device = GetTypeAndDevice("/boot", info_dict)
+ recovery_type, recovery_device = GetTypeAndDevice("/recovery", info_dict)
sh = """#!/system/bin/sh
if ! applypatch -c %(recovery_type)s:%(recovery_device)s:%(recovery_size)d:%(recovery_sha1)s; then