commit 619b162d67e0dd4e5e99c78e67dd8729aa37320b
author Jin Qian <jinqian@google.com> Fri Apr 21 14:36:12 2017 -0700
committer Jin Qian <jinqian@google.com> Tue Jun 27 00:34:43 2017 +0000
tree 842d08a8caea1ec0f6ba74feb9731a8609211401
parent 855eaffff674f0c90cf6fe107f8d10b50efc3965

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
Merged-In: I10a9f4c1f4754ad864b2df45b1f879180ab33876

Android.mk

diff --git a/Android.mk b/Android.mk
index 5f3a8a4..cfd55a7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -83,9 +83,11 @@
 
 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
 
@@ -112,6 +114,7 @@
     libverifier \
     libbatterymonitor \
     libbootloader_message \
+    libfs_mgr \
     libext4_utils \
     libsparse \
     libziparchive \
@@ -122,7 +125,6 @@
     libfusesideload \
     libminui \
     libpng \
-    libfs_mgr \
     libcrypto_utils \
     libcrypto \
     libvintf_recovery \
@@ -151,7 +153,7 @@
 endif
 
 ifeq ($(BOARD_CACHEIMAGE_PARTITION_SIZE),)
-LOCAL_REQUIRED_MODULES := recovery-persist recovery-refresh
+LOCAL_REQUIRED_MODULES += recovery-persist recovery-refresh
 endif
 
 include $(BUILD_EXECUTABLE)