ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Revert "e2fsck: drop -f when TARGET_USES_MKE2FS is enabled"" am: cbb91a538f

Browse source 
am: b2ce87de12

Change-Id: I754d121a0d94a281cbdcb8642d0bb9722f0be5b0
This commit is contained in:
Keun-young Park 2017-02-15 21:33:54 +00:00 • committed by android-build-merger
commit 12e13e172d
2 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs_mgr/Android.mk
View file

@ -35,11 +35,6 @@ LOCAL_MODULE:= libfs_mgr
LOCAL_STATIC_LIBRARIES := $(common_static_libraries) LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_CFLAGS := -Werror 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))) ifneq (,$(filter userdebug,$(TARGET_BUILD_VARIANT)))
LOCAL_CFLAGS += -DALLOW_ADBD_DISABLE_VERITY=1 LOCAL_CFLAGS += -DALLOW_ADBD_DISABLE_VERITY=1
endif endif

2
fs_mgr/fs_mgr.cpp
View file

@ -103,9 +103,7 @@ static void check_fs(const char *blk_device, char *fs_type, char *target)
char tmpmnt_opts[64] = "errors=remount-ro"; char tmpmnt_opts[64] = "errors=remount-ro";
const char *e2fsck_argv[] = { const char *e2fsck_argv[] = {
E2FSCK_BIN, E2FSCK_BIN,
#ifndef TARGET_USES_MKE2FS // "-f" only for old ext4 generation tool
"-f", "-f",
#endif
"-y", "-y",
blk_device blk_device
}; };