commit dee5abd85aed47a5e45fb5ea0c3d406855878f34
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 02 21:34:49 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 02 21:34:49 2017 +0000
tree dfa0837dafcf17c8df7ed679ffc33b9161352a2c
parent 1c505a1985faef34963120e403d9fbd0d406640c
parent f0ebe872a256d2be2b16736e595a41e2a10e4b77

Merge "Always use MKE2FS to build ext4 image"

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index d9c3ef0..ddedc5b 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -613,15 +613,9 @@
 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