commit 1343ec169c1bbbf7c5f1d5d2ce6d30d27bbea992
author Ying Wang <wangying@google.com> Wed Jun 04 22:24:51 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 04 22:24:51 2014 +0000
tree e165635bc23025604c34a710089c5b2dfdce73b2
parent dc7ff05427e885a59e8884e0f8e10a6c78f2842b
parent b75fe4696e847ef49aa9b11693243c00de497808

am b75fe469: am eafdd2cd: Fix emulator builds

* commit 'b75fe4696e847ef49aa9b11693243c00de497808':
  Fix emulator builds

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index c46c301..d27be6f 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -342,9 +342,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):