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

Commit 2a9b910b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Rename mkf2fsuserimg.sh and mksquashfsimage.sh"

parents 7aad5369 b0002088

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -4961,9 +4961,9 @@ INTERNAL_OTATOOLS_MODULES := \ 
  mke2fs \

  mke2fs.conf \

  mkfs.erofs \

  mkf2fsuserimg.sh \

  mkf2fsuserimg \

  mksquashfs \

  mksquashfsimage.sh \

  mksquashfsimage \

  mkuserimg_mke2fs \

  ota_extractor \

  ota_from_target_files \

core/config.mk

+2 −2
Original line number Diff line number Diff line
@@ -603,8 +603,8 @@ FS_GET_STATS := $(HOST_OUT_EXECUTABLES)/fs_get_stats$(HOST_EXECUTABLE_SUFFIX) 
MKEXTUSERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs

MKE2FS_CONF := system/extras/ext4_utils/mke2fs.conf

MKEROFS := $(HOST_OUT_EXECUTABLES)/mkfs.erofs

MKSQUASHFSUSERIMG := $(HOST_OUT_EXECUTABLES)/mksquashfsimage.sh

MKF2FSUSERIMG := $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh

MKSQUASHFSUSERIMG := $(HOST_OUT_EXECUTABLES)/mksquashfsimage

MKF2FSUSERIMG := $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg

SIMG2IMG := $(HOST_OUT_EXECUTABLES)/simg2img$(HOST_EXECUTABLE_SUFFIX)

E2FSCK := $(HOST_OUT_EXECUTABLES)/e2fsck$(HOST_EXECUTABLE_SUFFIX)

TUNE2FS := $(HOST_OUT_EXECUTABLES)/tune2fs$(HOST_EXECUTABLE_SUFFIX)

tools/releasetools/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ python_defaults { 
        "mkuserimg_mke2fs",

        "simg2img",

        "tune2fs",

        "mkf2fsuserimg.sh",

        "mkf2fsuserimg",

        "fsck.f2fs",

    ],

}

tools/releasetools/build_image.py

+2 −2
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ def BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config): 


    run_fsck = RunErofsFsck

  elif fs_type.startswith("squash"):

    build_command = ["mksquashfsimage.sh"]

    build_command = ["mksquashfsimage"]

    build_command.extend([in_dir, out_file])

    if "squashfs_sparse_flag" in prop_dict and not disable_sparse:

      build_command.extend([prop_dict["squashfs_sparse_flag"]])
@@ -387,7 +387,7 @@ def BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config): 
    if prop_dict.get("squashfs_disable_4k_align") == "true":

      build_command.extend(["-a"])

  elif fs_type.startswith("f2fs"):

    build_command = ["mkf2fsuserimg.sh"]

    build_command = ["mkf2fsuserimg"]

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

    if "f2fs_sparse_flag" in prop_dict and not disable_sparse:

      build_command.extend([prop_dict["f2fs_sparse_flag"]])