diff options
| author | 2020-05-06 07:32:12 +0000 | |
|---|---|---|
| committer | 2020-05-06 07:32:12 +0000 | |
| commit | ec8abc0eb3e8e71a935c1745b3e99a770728a28f (patch) | |
| tree | f0bc16db050643e52524549aca5c2dcfd2288a5f /tools/releasetools/common.py | |
| parent | ad0329462b6bbd64b8747ecd167e4663a3b21806 (diff) | |
| parent | d8e24eee70174b3b388aa246178b2c094ca0683e (diff) | |
Merge "releasetools: Fallback to "mkbootimg_args" if "recovery_mkbootimg_args" not found."
Diffstat (limited to 'tools/releasetools/common.py')
| -rw-r--r-- | tools/releasetools/common.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 7f40374ed6..1abf5a5cc6 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -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(): |