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

Commit c0f41427 authored by Jin Qian's avatar Jin Qian Committed by android-build-merger
Browse files

Merge "Always use MKE2FS to build ext4 image" am: dee5abd8 am: d4fcfea7 

am: 511fb3a7

Change-Id: Ide2c2170b7b51cbd04449b6e0cb9924e7335238d
parents 6f17a1bc 511fb3a7

core/config.mk

+0 −6
Original line number Diff line number Diff line
@@ -614,15 +614,9 @@ AVBTOOL := $(BOARD_CUSTOM_AVBTOOL) 
endif

APICHECK := $(HOST_OUT_EXECUTABLES)/apicheck$(HOST_EXECUTABLE_SUFFIX)

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

ifeq ($(TARGET_USES_MKE2FS),true)

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

MKEXTUSERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs.sh

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

else

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

MKEXTUSERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg.sh

MKE2FS_CONF :=

endif

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)

MKSQUASHFSUSERIMG := $(HOST_OUT_EXECUTABLES)/mksquashfsimage.sh