am eafdd2cd: Fix emulator builds

* commit 'eafdd2cd878c8fd23033302a2c5010505412981f':
  Fix emulator builds
This commit is contained in:
Ying Wang 2014-06-04 22:21:38 +00:00 committed by Android Git Automerger
commit b75fe4696e

View file

@ -339,9 +339,12 @@ def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir,
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):