StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename mkf2fsuserimg.sh and mksquashfsimage.sh

Browse Source 
See other cl in this topic for more information.

Bug: 198619163
Test: Presubmits
Change-Id: Ib39e8513a303a12e8bb6464a114ec39aa087d58a
This commit is contained in:
Cole Faust
2022-09-05 18:34:56 -07:00
parent 7aad536922
commit b000208877
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/Makefile
View File

@@ -4961,9 +4961,9 @@ INTERNAL_OTATOOLS_MODULES := \
mke2fs \ mke2fs \
mke2fs.conf \ mke2fs.conf \
mkfs.erofs \ mkfs.erofs \
mkf2fsuserimg.sh \ mkf2fsuserimg \
mksquashfs \ mksquashfs \
mksquashfsimage.sh \ mksquashfsimage \
mkuserimg_mke2fs \ mkuserimg_mke2fs \
ota_extractor \ ota_extractor \
ota_from_target_files \ ota_from_target_files \

4
core/config.mk
View File

@@ -603,8 +603,8 @@ FS_GET_STATS := $(HOST_OUT_EXECUTABLES)/fs_get_stats$(HOST_EXECUTABLE_SUFFIX)
MKEXTUSERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs MKEXTUSERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs
MKE2FS_CONF := system/extras/ext4_utils/mke2fs.conf MKE2FS_CONF := system/extras/ext4_utils/mke2fs.conf
MKEROFS := $(HOST_OUT_EXECUTABLES)/mkfs.erofs MKEROFS := $(HOST_OUT_EXECUTABLES)/mkfs.erofs
MKSQUASHFSUSERIMG := $(HOST_OUT_EXECUTABLES)/mksquashfsimage.sh MKSQUASHFSUSERIMG := $(HOST_OUT_EXECUTABLES)/mksquashfsimage
MKF2FSUSERIMG := $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh MKF2FSUSERIMG := $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg
SIMG2IMG := $(HOST_OUT_EXECUTABLES)/simg2img$(HOST_EXECUTABLE_SUFFIX) SIMG2IMG := $(HOST_OUT_EXECUTABLES)/simg2img$(HOST_EXECUTABLE_SUFFIX)
E2FSCK := $(HOST_OUT_EXECUTABLES)/e2fsck$(HOST_EXECUTABLE_SUFFIX) E2FSCK := $(HOST_OUT_EXECUTABLES)/e2fsck$(HOST_EXECUTABLE_SUFFIX)
TUNE2FS := $(HOST_OUT_EXECUTABLES)/tune2fs$(HOST_EXECUTABLE_SUFFIX) TUNE2FS := $(HOST_OUT_EXECUTABLES)/tune2fs$(HOST_EXECUTABLE_SUFFIX)

2
tools/releasetools/Android.bp
View File

@@ -62,7 +62,7 @@ python_defaults {
"mkuserimg_mke2fs", "mkuserimg_mke2fs",
"simg2img", "simg2img",
"tune2fs", "tune2fs",
"mkf2fsuserimg.sh", "mkf2fsuserimg",
"fsck.f2fs", "fsck.f2fs",
], ],
} }

4
tools/releasetools/build_image.py
View File

@@ -365,7 +365,7 @@ def BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config):
run_fsck = RunErofsFsck run_fsck = RunErofsFsck
elif fs_type.startswith("squash"): elif fs_type.startswith("squash"):
build_command = ["mksquashfsimage.sh"] build_command = ["mksquashfsimage"]
build_command.extend([in_dir, out_file]) build_command.extend([in_dir, out_file])
if "squashfs_sparse_flag" in prop_dict and not disable_sparse: if "squashfs_sparse_flag" in prop_dict and not disable_sparse:
build_command.extend([prop_dict["squashfs_sparse_flag"]]) 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": if prop_dict.get("squashfs_disable_4k_align") == "true":
build_command.extend(["-a"]) build_command.extend(["-a"])
elif fs_type.startswith("f2fs"): elif fs_type.startswith("f2fs"):
build_command = ["mkf2fsuserimg.sh"] build_command = ["mkf2fsuserimg"]
build_command.extend([out_file, prop_dict["image_size"]]) build_command.extend([out_file, prop_dict["image_size"]])
if "f2fs_sparse_flag" in prop_dict and not disable_sparse: if "f2fs_sparse_flag" in prop_dict and not disable_sparse:
build_command.extend([prop_dict["f2fs_sparse_flag"]]) build_command.extend([prop_dict["f2fs_sparse_flag"]])