diff options
| author | 2020-05-07 17:42:42 +0000 | |
|---|---|---|
| committer | 2020-05-07 17:42:42 +0000 | |
| commit | 60f3ee6406a8b17ca6b49ce34f12e653a8d2955d (patch) | |
| tree | aabb4cf859422cf93aa29c2a98fa09fa1e2f4340 | |
| parent | d4297e0b647cca6b07e8e421dcd05552c5dc1ed0 (diff) | |
| parent | e4d5d568a3cd1d22f0cf11a45da40aa07df307eb (diff) | |
Merge "releasetools: Fallback to "mkbootimg_args" if "recovery_mkbootimg_args" not found." into rvc-dev
| -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 d4c73a49e1..2bef6de1de 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -1109,6 +1109,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(): |