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

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

Browse Source
This commit is contained in:
Treehugger Robot
2020-05-06 07:32:12 +00:00
committed by Gerrit Code Review
parent ad0329462b d8e24eee70
commit ec8abc0eb3
1 changed files with 4 additions and 0 deletions
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": if partition_name == "recovery":
args = info_dict.get("recovery_mkbootimg_args") 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: else:
args = info_dict.get("mkbootimg_args") args = info_dict.get("mkbootimg_args")
if args and args.strip(): if args and args.strip():