commit 9683b2f1363c44c614820a60877715812605df3e
author Hridya Valsaraju <hridya@google.com> Tue Jan 22 18:08:59 2019 -0800
committer Hridya Valsaraju <hridya@google.com> Wed Jan 23 09:14:55 2019 -0800
tree 7a0b1cfc12ac164151824a975ebb6091081c43f7
parent 0d5fcc075e6abf4217819fe688c572b0564987db

Support including DTB image

Bug: 111136242
Test: When BOARD_PREBUILT_DTB_DIR is set correctly,
generated $OUT/boot.img contains the DTB image.

Change-Id: I282e31b04cc60383377b9e9b54f8fe64a8140242

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index dcc083c..59a12f1 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -587,6 +587,11 @@
     cmd.append("--second")
     cmd.append(fn)
 
+  fn = os.path.join(sourcedir, "dtb")
+  if os.access(fn, os.F_OK):
+    cmd.append("--dtb")
+    cmd.append(fn)
+
   fn = os.path.join(sourcedir, "cmdline")
   if os.access(fn, os.F_OK):
     cmd.append("--cmdline")