am b75fe469: am eafdd2cd: Fix emulator builds

* commit 'b75fe4696e847ef49aa9b11693243c00de497808':
  Fix emulator builds
This commit is contained in:
Ying Wang 2014-06-04 22:24:51 +00:00 committed by Android Git Automerger
commit 1343ec169c

View file

@ -342,9 +342,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),
data = BuildBootableImage(os.path.join(unpack_dir, tree_subdir),
os.path.join(unpack_dir, fs_config),
info_dict))
info_dict)
if data:
return File(name, data)
return None
def UnzipTemp(filename, pattern=None):