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

Commit 57332227 authored by Tianjie Xu's avatar Tianjie Xu
Browse files

Use the new executable for mkuserimg_mke2fs 

This is in line with the change of mkuserimg_mke2fs.sh to python binary.

Bug: 112555072
Bug: 63866463
Test: unittests pass
Change-Id: I82c0be1e5bbc685edc15120da73aa43fdc9f2f05
parent 48a575c0

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2960,7 +2960,7 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ 
  $(HOST_OUT_JAVA_LIBRARIES)/BootSignature.jar \

  $(HOST_OUT_JAVA_LIBRARIES)/VeritySigner.jar \

  $(HOST_OUT_EXECUTABLES)/mke2fs \

  $(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs.sh \

  $(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs \

  $(HOST_OUT_EXECUTABLES)/e2fsdroid \

  $(HOST_OUT_EXECUTABLES)/mksquashfsimage.sh \

  $(HOST_OUT_EXECUTABLES)/mksquashfs \

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ endif 
APICHECK := $(HOST_OUT_EXECUTABLES)/apicheck$(HOST_EXECUTABLE_SUFFIX)

FS_GET_STATS := $(HOST_OUT_EXECUTABLES)/fs_get_stats$(HOST_EXECUTABLE_SUFFIX)

MAKE_EXT4FS := $(HOST_OUT_EXECUTABLES)/mke2fs$(HOST_EXECUTABLE_SUFFIX)

MKEXTUSERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs.sh

MKEXTUSERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs

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

BLK_ALLOC_TO_BASE_FS := $(HOST_OUT_EXECUTABLES)/blk_alloc_to_base_fs$(HOST_EXECUTABLE_SUFFIX)

MAKE_SQUASHFS := $(HOST_OUT_EXECUTABLES)/mksquashfs$(HOST_EXECUTABLE_SUFFIX)

tools/releasetools/build_image.py

+1 −1
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None): 
    if "flash_logical_block_size" in prop_dict:

      build_command.extend(["-o", prop_dict["flash_logical_block_size"]])

    # Specify UUID and hash_seed if using mke2fs.

    if prop_dict["ext_mkuserimg"] == "mkuserimg_mke2fs.sh":

    if prop_dict["ext_mkuserimg"] == "mkuserimg_mke2fs":

      if "uuid" in prop_dict:

        build_command.extend(["-U", prop_dict["uuid"]])

      if "hash_seed" in prop_dict:

tools/releasetools/test_build_image.py

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ class BuildImageTest(unittest.TestCase): 
    """Tests the result parsing from actual call to mke2fs."""

    input_dir = common.MakeTempDir()

    output_image = common.MakeTempFile(suffix='.img')

    command = ['mkuserimg_mke2fs.sh', input_dir, output_image, 'ext4',

    command = ['mkuserimg_mke2fs', input_dir, output_image, 'ext4',

               '/system', '409600', '-j', '0']

    ext4fs_output, exit_code = RunCommand(command)

    self.assertEqual(0, exit_code)

tools/releasetools/test_validate_target_files.py

+2 −2
Original line number Diff line number Diff line
@@ -121,13 +121,13 @@ class ValidateTargetFilesTest(unittest.TestCase): 


    # Use an empty root directory.

    system_root = common.MakeTempDir()

    cmd = ['mkuserimg_mke2fs.sh', '-s', system_root, output_file, 'ext4',

    cmd = ['mkuserimg_mke2fs', '-s', system_root, output_file, 'ext4',

           '/system', str(adjusted_size), '-j', '0']

    proc = common.Run(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)

    stdoutdata, _ = proc.communicate()

    self.assertEqual(

        0, proc.returncode,

        "Failed to create system image with mkuserimg_mke2fs.sh: {}".format(

        "Failed to create system image with mkuserimg_mke2fs: {}".format(

            stdoutdata))



    # Append the verity metadata.