Merge "Skip some build steps if not building system image." am: 4a3c68bffa
am: 8a4041a18e
am: 36b230c394
Change-Id: Idc9c8e73f2b8cbc178a42281dcdc03387ce67adc
This commit is contained in:
commit
6453fe1984
1 changed files with 5 additions and 3 deletions
|
@ -734,6 +734,7 @@ def AddImagesToTargetFiles(filename):
|
|||
os.path.exists(os.path.join(OPTIONS.input_tmp,
|
||||
"IMAGES",
|
||||
"product_services.img")))
|
||||
has_system = os.path.isdir(os.path.join(OPTIONS.input_tmp, "SYSTEM"))
|
||||
has_system_other = os.path.isdir(os.path.join(OPTIONS.input_tmp,
|
||||
"SYSTEM_OTHER"))
|
||||
|
||||
|
@ -798,9 +799,10 @@ def AddImagesToTargetFiles(filename):
|
|||
if output_zip:
|
||||
recovery_two_step_image.AddToZip(output_zip)
|
||||
|
||||
banner("system")
|
||||
partitions['system'] = AddSystem(
|
||||
output_zip, recovery_img=recovery_image, boot_img=boot_image)
|
||||
if has_system:
|
||||
banner("system")
|
||||
partitions['system'] = AddSystem(
|
||||
output_zip, recovery_img=recovery_image, boot_img=boot_image)
|
||||
|
||||
if has_vendor:
|
||||
banner("vendor")
|
||||
|
|
Loading…
Reference in a new issue