openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "releasetools: Fallback to "mkbootimg_args" if "recovery_mkbootimg_args" not found." am: ec8abc0eb3 am: ec788a7f58 

Change-Id: Id69aafe1eb55e2f126f53d302dfaf91740015f0f
This commit is contained in:
Treehugger Robot 2020-05-06 08:08:57 +00:00 committed by Automerger Merge Worker
parent fce49d95be ec788a7f58
commit aa887670ae
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/releasetools/common.py
View File

@ -1148,6 +1148,10 @@ def _BuildBootableImage(image_name, sourcedir, fs_config_file, info_dict=None,
if partition_name == "recovery":
args = info_dict.get("recovery_mkbootimg_args")
if not args:
# Fall back to "mkbootimg_args" for recovery image
# in case "recovery_mkbootimg_args" is not set.
args = info_dict.get("mkbootimg_args")
else:
args = info_dict.get("mkbootimg_args")
if args and args.strip():