recovery: replace make_ext4 with e2fsprogs

Execute mke2fs to create empty ext4 filesystem.
Execute e2fsdroid to add files to filesystem.

Test: enter recovery mode and wipe data
Bug: 35219933
Change-Id: I10a9f4c1f4754ad864b2df45b1f879180ab33876
(cherry picked from commit ac31808cd3)
This commit is contained in:
Jin Qian
2017-04-21 14:36:12 -07:00
parent 8155a8ba74
commit ded2dac082
3 changed files with 86 additions and 11 deletions
+5 -3
View File
@@ -85,9 +85,11 @@ LOCAL_MODULE := recovery
LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_REQUIRED_MODULES := e2fsdroid_static mke2fs_static mke2fs.conf
ifeq ($(TARGET_USERIMAGES_USE_F2FS),true)
ifeq ($(HOST_OS),linux)
LOCAL_REQUIRED_MODULES := mkfs.f2fs
LOCAL_REQUIRED_MODULES += mkfs.f2fs
endif
endif
@@ -120,6 +122,7 @@ LOCAL_STATIC_LIBRARIES := \
libverifier \
libbatterymonitor \
libbootloader_message \
libfs_mgr \
libext4_utils \
libsparse \
libziparchive \
@@ -130,7 +133,6 @@ LOCAL_STATIC_LIBRARIES := \
libfusesideload \
libminui \
libpng \
libfs_mgr \
libcrypto_utils \
libcrypto \
libvintf_recovery \
@@ -159,7 +161,7 @@ else
endif
ifeq ($(BOARD_CACHEIMAGE_PARTITION_SIZE),)
LOCAL_REQUIRED_MODULES := recovery-persist recovery-refresh
LOCAL_REQUIRED_MODULES += recovery-persist recovery-refresh
endif
include $(BUILD_EXECUTABLE)