StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am eafdd2cd: Fix emulator builds

Browse Source 
* 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
parent bc080d510f eafdd2cd87
commit b75fe4696e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/releasetools/common.py
View File

@@ -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):