commit 514d6777c8562a685a33c49cdf4abd7589199e79
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 07 17:56:32 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 07 17:56:32 2020 +0000
tree aabb4cf859422cf93aa29c2a98fa09fa1e2f4340
parent 699fd53c19981f4f37e4d31d737dd6a88c898d3d
parent 60f3ee6406a8b17ca6b49ce34f12e653a8d2955d

Merge "releasetools: Fallback to "mkbootimg_args" if "recovery_mkbootimg_args" not found." into rvc-dev am: 60f3ee6406

Change-Id: Id93491861ba3ae601327dc50d7a5a35ffd58f77c

tools/releasetools/common.py

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():