commit e555f779626faeeddd8d23339241fa6a9240fa28
author Sami Tolvanen <samitolvanen@google.com> Fri Mar 04 15:41:02 2016 -0800
committer Sami Tolvanen <samitolvanen@google.com> Tue Mar 08 08:21:52 2016 -0800
tree 71c51fc4fbe243db9be55c4619f5d5435eda96ff
parent 84bc4b78cc188e795e94eedc437cf9c5567c6506

build: pass version and patch level to mkbootimg

Add --os_version and --os_patch_level arguments to mkbootimg.

Needs matching changes from
  I57682611e0c27fec5ed284da7d9a788383ff98b1

Bug: 27498078
Bug: 22914603
Change-Id: I04e20b0de40d864aac92ac7bcf466a6cbde3d0e4
(cherry pick from commit 8fb47f191f804d21e252ef7bb66886ea087c2d56)

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index cde49cd..563ce31 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -414,6 +414,10 @@
   if args and args.strip():
     cmd.extend(shlex.split(args))
 
+  args = info_dict.get("mkbootimg_version_args", None)
+  if args and args.strip():
+    cmd.extend(shlex.split(args))
+
   if has_ramdisk:
     cmd.extend(["--ramdisk", ramdisk_img.name])