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

Merge "Skip some build steps if not building system image." am: 4a3c68bffa

Browse Source 
am: 8a4041a18e

Change-Id: I17249226965c48c599da4a6f932e4d63b0c7a5d0
This commit is contained in:
Bill Peckham
2019-02-13 15:59:50 -08:00
committed by android-build-merger
parent 89527442c9 8a4041a18e
commit 36b230c394
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/releasetools/add_img_to_target_files.py
View File

@@ -734,6 +734,7 @@ def AddImagesToTargetFiles(filename):
os.path.exists(os.path.join(OPTIONS.input_tmp, os.path.exists(os.path.join(OPTIONS.input_tmp,
"IMAGES", "IMAGES",
"product_services.img"))) "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, has_system_other = os.path.isdir(os.path.join(OPTIONS.input_tmp,
"SYSTEM_OTHER")) "SYSTEM_OTHER"))
@@ -798,9 +799,10 @@ def AddImagesToTargetFiles(filename):
if output_zip: if output_zip:
recovery_two_step_image.AddToZip(output_zip) recovery_two_step_image.AddToZip(output_zip)
banner("system") if has_system:
partitions['system'] = AddSystem( banner("system")
output_zip, recovery_img=recovery_image, boot_img=boot_image) partitions['system'] = AddSystem(
output_zip, recovery_img=recovery_image, boot_img=boot_image)
if has_vendor: if has_vendor:
banner("vendor") banner("vendor")