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

Commit 10c9f5d9 authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by Gerrit Code Review
Browse files

Merge "core, release: add sload.f2fs for otatools.zip"

parents c6b28799 2ea1eba9

core/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2166,6 +2166,7 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ 
  $(HOST_OUT_EXECUTABLES)/mksquashfs \

  $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh \

  $(HOST_OUT_EXECUTABLES)/make_f2fs \

  $(HOST_OUT_EXECUTABLES)/sload_f2fs \

  $(HOST_OUT_EXECUTABLES)/simg2img \

  $(HOST_OUT_EXECUTABLES)/e2fsck \

  $(HOST_OUT_EXECUTABLES)/build_verity_tree \

tools/releasetools/build_image.py

+11 −0
Original line number Diff line number Diff line
@@ -517,6 +517,17 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None): 
  elif fs_type.startswith("f2fs"):

    build_command = ["mkf2fsuserimg.sh"]

    build_command.extend([out_file, prop_dict["partition_size"]])

    if fs_config:

      build_command.extend(["-C", fs_config])

    build_command.extend(["-f", in_dir])

    if target_out:

      build_command.extend(["-D", target_out])

    if "selinux_fc" in prop_dict:

      build_command.extend(["-s", prop_dict["selinux_fc"]])

    build_command.extend(["-t", prop_dict["mount_point"]])

    if "timestamp" in prop_dict:

      build_command.extend(["-T", str(prop_dict["timestamp"])])

    build_command.extend(["-L", prop_dict["mount_point"]])

  else:

    print("Error: unknown filesystem type '%s'" % (fs_type))

    return False