openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Fix emulator builds 

which don't have boot.img.

Change-Id: Id97a53c5356d435d9c70107ef047bed003769e22
This commit is contained in:
Ying Wang 2014-02-05 11:28:51 -08:00
parent 9cee77b370
commit d89ffa8623
2 changed files with 9 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

@ -354,9 +354,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):

3
tools/releasetools/make_recovery_patch
View File

@ -39,6 +39,9 @@ def main(argv):
boot_img = common.GetBootableImage("boot.img", "boot.img", boot_img = common.GetBootableImage("boot.img", "boot.img",
input_dir, "BOOT") input_dir, "BOOT")
if not recovery_img or not boot_img:
sys.exit(0)
def output_sink(fn, data): def output_sink(fn, data):
with open(os.path.join(output_dir, "SYSTEM", *fn.split("/")), "wb") as f: with open(os.path.join(output_dir, "SYSTEM", *fn.split("/")), "wb") as f:
f.write(data) f.write(data)