commit 1207d5e02ba3193c92bc858fa820e4e8fe3fcc71
author JP Abgrall <jpa@google.com> Fri Jun 27 21:12:10 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 27 15:56:14 2014 +0000
tree 5f4a9ff6ae06e41a2dd2659be3729242f5db71b7
parent e2543ea2eac369a54008f8307132778707f3a1e7
parent 4d09dcb2c6d5e2fe8e8ed0780ee2da6ac8bda3c4

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

tools/releasetools/img_from_target_files.py

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 @@
 
   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