diff options
| author | JP Abgrall <jpa@google.com> | 2014-06-26 21:15:39 -0700 |
|---|---|---|
| committer | JP Abgrall <jpa@google.com> | 2014-06-26 21:15:39 -0700 |
| commit | 4d09dcb2c6d5e2fe8e8ed0780ee2da6ac8bda3c4 (patch) | |
| tree | 149646cb77cdf0a650034bc7690d6c34f083e56b /tools/releasetools/img_from_target_files.py | |
| parent | 5bc22c9637d33f7f55109f2eaa124d66d9c90fc4 (diff) | |
| download | build-4d09dcb2c6d5e2fe8e8ed0780ee2da6ac8bda3c4.zip build-4d09dcb2c6d5e2fe8e8ed0780ee2da6ac8bda3c4.tar.gz build-4d09dcb2c6d5e2fe8e8ed0780ee2da6ac8bda3c4.tar.bz2 | |
releasetools: only allow yaffs to have no userdata image size (fix build)
In the past, there was an exception for ext-base fs types to
deal with the lack of image size.
Back then it was only yaffs and ext*.
So now we explicitely only allow yaffs to have no userdata image size.
Change-Id: Ie354ee6222a58228dbcce2c6934971a0737422af
Signed-off-by: JP Abgrall <jpa@google.com>
Diffstat (limited to 'tools/releasetools/img_from_target_files.py')
| -rwxr-xr-x | tools/releasetools/img_from_target_files.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/releasetools/img_from_target_files.py b/tools/releasetools/img_from_target_files.py index 6043355..9aab41c 100755 --- a/tools/releasetools/img_from_target_files.py +++ b/tools/releasetools/img_from_target_files.py @@ -154,8 +154,9 @@ def AddUserdata(output_zip): image_props = build_image.ImagePropFromGlobalDict(OPTIONS.info_dict, "data") - # If no userdata_size is provided for extfs, skip userdata.img. - if (image_props.get("fs_type", "").startswith("ext") and + # We only allow yaffs to have a 0/missing partition_size. + # 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")): return |