commit eafdd2cd878c8fd23033302a2c5010505412981f
author Ying Wang <wangying@google.com> Wed Feb 05 11:28:51 2014 -0800
committer Ying Wang <wangying@google.com> Wed Jun 04 15:16:17 2014 -0700
tree 1ab298adb517f5baf2c0ea0c3f3e5bf8d5e5ab0d
parent 2a386e0cfbdfa009038acede85876a7643f297f5

Fix emulator builds

which don't have boot.img.

Change-Id: Id97a53c5356d435d9c70107ef047bed003769e22

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 80bb10a..40a5089 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -339,9 +339,12 @@
   else:
     print "building image from target_files %s..." % (tree_subdir,)
     fs_config = "META/" + tree_subdir.lower() + "_filesystem_config.txt"
-    return File(name, BuildBootableImage(os.path.join(unpack_dir, tree_subdir),
-                                         os.path.join(unpack_dir, fs_config),
-                                         info_dict))
+    data = BuildBootableImage(os.path.join(unpack_dir, tree_subdir),
+                              os.path.join(unpack_dir, fs_config),
+                              info_dict)
+    if data:
+      return File(name, data)
+    return None
 
 
 def UnzipTemp(filename, pattern=None):