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

Don't make recovery patch for devices with prebuilt vendor

Browse Source 
Change-Id: I05c0155e6331bfeccd4ad545e003fa3fa3498044
This commit is contained in:
TheScarastic
2020-09-12 17:28:03 +00:00
committed by SkyMinus
parent 6a1b8b765e
commit abb95af328
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/releasetools/make_recovery_patch.py
View File

@@ -49,13 +49,19 @@ def main(argv):
board_uses_vendorimage = OPTIONS.info_dict.get(
"board_uses_vendorimage") == "true"
board_builds_vendorimage = OPTIONS.info_dict.get(
"board_builds_vendorimage") == "true"
target_files_dir = None
if board_uses_vendorimage:
if board_builds_vendorimage:
target_files_dir = "VENDOR"
else:
elif not board_uses_vendorimage:
target_files_dir = "SYSTEM/vendor"
def output_sink(fn, data):
if target_files_dir is None:
return
with open(os.path.join(output_dir, target_files_dir,
*fn.split("/")), "wb") as f:
f.write(data)

9
tools/releasetools/non_ab_ota.py
View File

@@ -676,12 +676,17 @@ def _WriteRecoveryImageToBoot(script, output_zip):
def HasRecoveryPatch(target_files_zip, info_dict):
board_uses_vendorimage = info_dict.get("board_uses_vendorimage") == "true"
board_builds_vendorimage = info_dict.get("board_builds_vendorimage") == "true"
target_files_dir = None
if board_uses_vendorimage:
if board_builds_vendorimage:
target_files_dir = "VENDOR"
else:
elif not board_uses_vendorimage:
target_files_dir = "SYSTEM/vendor"
if target_files_dir is None:
return True
patch = "%s/recovery-from-boot.p" % target_files_dir
img = "%s/etc/recovery.img" % target_files_dir