commit ec8abc0eb3e8e71a935c1745b3e99a770728a28f
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 06 07:32:12 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 06 07:32:12 2020 +0000
tree f0bc16db050643e52524549aca5c2dcfd2288a5f
parent ad0329462b6bbd64b8747ecd167e4663a3b21806
parent d8e24eee70174b3b388aa246178b2c094ca0683e

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

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 7f40374..1abf5a5 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -1148,6 +1148,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():