Fix emulator builds
which don't have boot.img. Change-Id: Id97a53c5356d435d9c70107ef047bed003769e22
This commit is contained in:
@@ -339,9 +339,12 @@ def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir,
|
|||||||
else:
|
else:
|
||||||
print "building image from target_files %s..." % (tree_subdir,)
|
print "building image from target_files %s..." % (tree_subdir,)
|
||||||
fs_config = "META/" + tree_subdir.lower() + "_filesystem_config.txt"
|
fs_config = "META/" + tree_subdir.lower() + "_filesystem_config.txt"
|
||||||
return File(name, BuildBootableImage(os.path.join(unpack_dir, tree_subdir),
|
data = BuildBootableImage(os.path.join(unpack_dir, tree_subdir),
|
||||||
os.path.join(unpack_dir, fs_config),
|
os.path.join(unpack_dir, fs_config),
|
||||||
info_dict))
|
info_dict)
|
||||||
|
if data:
|
||||||
|
return File(name, data)
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
def UnzipTemp(filename, pattern=None):
|
def UnzipTemp(filename, pattern=None):
|
||||||
|
Reference in New Issue
Block a user