commit 2347a3b7d9c8892c1556c08ba3e3bdf00e7f4509
author Benoit Fradin <benoit.fradin@intel.com> Mon Jul 14 21:00:43 2014 +0200
committer The Android Automerger <android-build@google.com> Thu Aug 14 11:57:14 2014 -0700
tree 581a80f26ad203ca91498524cb30fcfe825c7eb1
parent 60433bb78d8033a84dd80570f3eba63312229637

BuildBootImage: Add secondstage image support [DO NOT MERGE]

The AOSP bootimage format allows the use of a second stage image
however the BuildBootableImage function does not allows the "second"
optional argument. This patch adds the support of this argument.

Bug: 17035158

Change-Id: I8ed9d9e56449945c2d42fc908269921c394f68c0
Signed-off-by: Benoit Fradin <benoit.fradin@intel.com>
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Signed-off-by: Patrick Tjin <pattjin@google.com>

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 50ef451..947a9e4 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -303,6 +303,11 @@
 
   cmd = [mkbootimg, "--kernel", os.path.join(sourcedir, "kernel")]
 
+  fn = os.path.join(sourcedir, "second")
+  if os.access(fn, os.F_OK):
+    cmd.append("--second")
+    cmd.append(fn)
+
   fn = os.path.join(sourcedir, "cmdline")
   if os.access(fn, os.F_OK):
     cmd.append("--cmdline")