commit a8c37be28598c6bdd920af4c306a29db013b68e7
author Sami Tolvanen <samitolvanen@google.com> Tue Mar 15 16:49:30 2016 +0000
committer Sami Tolvanen <samitolvanen@google.com> Tue Mar 15 11:23:56 2016 -0700
tree 32daac6d89d0565979432d34db9469d2f5600909
parent 914b37f4e3430606ec9850f05c51fb112279484b

Revert "Revert "build: pass version and patch level to mkbootimg""

This reverts commit 494a9090f96a7fc4e77f8f4fbb26d876a5fc8438.

Bug: 27498078
Bug: 22914603
Change-Id: Iee6a784271ec32c6bfcc0a6ad3f0395d82016df3
(cherry picked from commit 3303d909a1c43dec0d99d2c852311cf2171c7c18)

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])