commit f84668e1da304218e7f63624689cf1e39b162937
author Steve Muckle <smuckle@google.com> Mon Mar 16 19:13:46 2020 -0700
committer Steve Muckle <smuckle@google.com> Tue Apr 14 13:03:58 2020 -0700
tree 4b4379b756eeccb6276f599cdf2937b974724d1e
parent 65ca0eec96643c23accdc7048b43080901988a14

Enable non-v3 recovery image with v3 boot image

Add support for building a non-v3 recovery image along with a
v3 boot.img and vendor_boot image.

Bug: 150825361
Change-Id: I80d4e71ff09b83dd1c7f9accb4de99a30f95f4bf

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index dcf470a..ad69fef 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -1104,7 +1104,13 @@
     cmd.append("--pagesize")
     cmd.append(open(fn).read().rstrip("\n"))
 
-  args = info_dict.get("mkbootimg_args")
+  # "boot" or "recovery", without extension.
+  partition_name = os.path.basename(sourcedir).lower()
+
+  if partition_name == "recovery":
+    args = info_dict.get("recovery_mkbootimg_args")
+  else:
+    args = info_dict.get("mkbootimg_args")
   if args and args.strip():
     cmd.extend(shlex.split(args))
 
@@ -1122,9 +1128,6 @@
   else:
     cmd.extend(["--output", img.name])
 
-  # "boot" or "recovery", without extension.
-  partition_name = os.path.basename(sourcedir).lower()
-
   if partition_name == "recovery":
     if info_dict.get("include_recovery_dtbo") == "true":
       fn = os.path.join(sourcedir, "recovery_dtbo")