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

am f1a8c8c5: Merge "Fix up a few callers of GetTypeAndDevice."

Browse Source 
* commit 'f1a8c8c5de090221615bf1934e82e1fa9afc54b0':
  Fix up a few callers of GetTypeAndDevice.
This commit is contained in:
Dan Albert
2015-03-28 02:20:24 +00:00
committed by Android Git Automerger
parent 1e9b11f4b1 f1a8c8c5de
commit b6339d74fe
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()
output_sink("recovery-from-boot.p", patch)
td_pair = GetTypeAndDevice("/boot", info_dict)
if not td_pair:
try:
boot_type, boot_device = GetTypeAndDevice("/boot", info_dict)
recovery_type, recovery_device = GetTypeAndDevice("/recovery", info_dict)
except KeyError:
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
if ! applypatch -c %(recovery_type)s:%(recovery_device)s:%(recovery_size)d:%(recovery_sha1)s; then