Merge "Add boringssl_self_test to base PRODUCT_PACKAGES." into rvc-dev
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index d4c73a4..2bef6de 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -1109,6 +1109,10 @@
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():
