Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1207d5e0 authored by JP Abgrall's avatar JP Abgrall Committed by Android (Google) Code Review
Browse files

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

parents e2543ea2 4d09dcb2

tools/releasetools/img_from_target_files.py

+3 −2
Original line number Original line Diff line number Diff line
@@ -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