diff --git a/fs_mgr/Android.mk b/fs_mgr/Android.mk index 956c702a9..4369e5a09 100644 --- a/fs_mgr/Android.mk +++ b/fs_mgr/Android.mk @@ -35,11 +35,6 @@ LOCAL_MODULE:= libfs_mgr LOCAL_STATIC_LIBRARIES := $(common_static_libraries) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_CFLAGS := -Werror -ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) - ifeq ($(TARGET_USES_MKE2FS), true) - LOCAL_CFLAGS += -DTARGET_USES_MKE2FS - endif -endif ifneq (,$(filter userdebug,$(TARGET_BUILD_VARIANT))) LOCAL_CFLAGS += -DALLOW_ADBD_DISABLE_VERITY=1 endif diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp index be84e8a51..176807801 100644 --- a/fs_mgr/fs_mgr.cpp +++ b/fs_mgr/fs_mgr.cpp @@ -103,9 +103,7 @@ static void check_fs(const char *blk_device, char *fs_type, char *target) char tmpmnt_opts[64] = "errors=remount-ro"; const char *e2fsck_argv[] = { E2FSCK_BIN, -#ifndef TARGET_USES_MKE2FS // "-f" only for old ext4 generation tool "-f", -#endif "-y", blk_device };