From f0ebe872a256d2be2b16736e595a41e2a10e4b77 Mon Sep 17 00:00:00 2001 From: Jin Qian Date: Wed, 1 Nov 2017 15:41:57 -0700 Subject: [PATCH] Always use MKE2FS to build ext4 image Bug: 64395169 Change-Id: I0118fe8ee5f677fdb9da616a11de304b2aefd0ba --- core/config.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/core/config.mk b/core/config.mk index 566faaeee4..dc6636c5de 100644 --- a/core/config.mk +++ b/core/config.mk @@ -626,15 +626,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