StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up a few callers of GetTypeAndDevice.

Browse Source 
Change-Id: I8f2d8d28b60715f917e9aceb8f851ad652034aa7
This commit is contained in:
Dan Albert
2015-03-27 19:11:53 -07:00
parent d63c78e058
commit ebb19aa01a
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/releasetools/common.py
View File

@@ -1252,14 +1252,11 @@ def MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img,
_, _, patch = d.ComputePatch() _, _, patch = d.ComputePatch()
output_sink("recovery-from-boot.p", patch) output_sink("recovery-from-boot.p", patch)
td_pair = GetTypeAndDevice("/boot", info_dict) try:
if not td_pair: boot_type, boot_device = GetTypeAndDevice("/boot", info_dict)
recovery_type, recovery_device = GetTypeAndDevice("/recovery", info_dict)
except KeyError:
return return
boot_type, boot_device = td_pair
td_pair = GetTypeAndDevice("/recovery", info_dict)
if not td_pair:
return
recovery_type, recovery_device = td_pair
sh = """#!/system/bin/sh sh = """#!/system/bin/sh
if ! applypatch -c %(recovery_type)s:%(recovery_device)s:%(recovery_size)d:%(recovery_sha1)s; then if ! applypatch -c %(recovery_type)s:%(recovery_device)s:%(recovery_size)d:%(recovery_sha1)s; then