commit 2ab64224cbfbfa3517c1f193bf104224b1c6cda9
author Keun-young Park <keunyoung@google.com> Tue Jan 10 20:01:27 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 10 20:01:27 2017 +0000
tree 2c7da78db3e3a09ff33a3f3f942a5be6b3d65990
parent 5631a76e7ebac53d09339f187d0256bc48d48dcb
parent 0ce3268e568a2184beb43d1478b1ff6210fac205

Merge "e2fsck: drop -f when TARGET_USES_MKE2FS is enabled" am: f3780f3cc8
am: 3dccdc5ec5

Change-Id: I514a3d79707cf2a795beec3f12b66911981410d0

fs_mgr/Android.mk

diff --git a/fs_mgr/Android.mk b/fs_mgr/Android.mk
index d6b699b..8997cab 100644
--- a/fs_mgr/Android.mk
+++ b/fs_mgr/Android.mk
@@ -32,6 +32,11 @@
 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

fs_mgr/fs_mgr.c

diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c
index 863c12c..7fac2fb 100644
--- a/fs_mgr/fs_mgr.c
+++ b/fs_mgr/fs_mgr.c
@@ -101,7 +101,9 @@
     char tmpmnt_opts[64] = "errors=remount-ro";
     char *e2fsck_argv[] = {
         E2FSCK_BIN,
+#ifndef TARGET_USES_MKE2FS // "-f" only for old ext4 generation tool
         "-f",
+#endif
         "-y",
         blk_device
     };