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

Merge "releasetools: only allow yaffs to have no userdata image size (fix build)"

Browse Source
This commit is contained in:
JP Abgrall
2014-06-27 21:12:10 +00:00
committed by Android (Google) Code Review
parent e2543ea2ea 4d09dcb2c6
commit 1207d5e02b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/releasetools/img_from_target_files.py
View File

@@ -154,8 +154,9 @@ def AddUserdata(output_zip):
image_props = build_image.ImagePropFromGlobalDict(OPTIONS.info_dict, image_props = build_image.ImagePropFromGlobalDict(OPTIONS.info_dict,
"data") "data")
# If no userdata_size is provided for extfs, skip userdata.img. # We only allow yaffs to have a 0/missing partition_size.
if (image_props.get("fs_type", "").startswith("ext") and # Extfs, f2fs must have a size. Skip userdata.img if no size.
if (not image_props.get("fs_type", "").startswith("yaffs") and
not image_props.get("partition_size")): not image_props.get("partition_size")):
return return