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

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

Browse source 
am: 3dccdc5ec5

Change-Id: I514a3d79707cf2a795beec3f12b66911981410d0
This commit is contained in:
Keun-young Park 2017-01-10 20:01:27 +00:00 • committed by android-build-merger
commit ef847af8bf
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs_mgr/Android.mk
View file

@ -32,6 +32,11 @@ 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.c
View file

@ -101,7 +101,9 @@ static void check_fs(char *blk_device, char *fs_type, char *target)
char tmpmnt_opts[64] = "errors=remount-ro"; char tmpmnt_opts[64] = "errors=remount-ro";
char *e2fsck_argv[] = { 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
}; };