tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 1343ec16: am b75fe469: am eafdd2cd: Fix emulator builds

Browse source 
* commit '1343ec169c1bbbf7c5f1d5d2ce6d30d27bbea992':
  Fix emulator builds
This commit is contained in:
Ying Wang 2014-06-04 22:30:05 +00:00 committed by Android Git Automerger
commit 1cd740f1f0
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools/releasetools/common.py
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),
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):