summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-07-21 21:00:46 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-07-21 21:00:46 +0200
commitf7c00ddaf62a6a09ae257d193cadf286af750700 (patch)
treeda9d57b57783dcf1ec1d9826eb293f552db046a0 /Android.mk
parentMerge "Fix the android-cloexec-* warnings in bootable/recovery" (diff)
parentrecovery: replace make_ext4 with e2fsprogs (diff)
downloadandroid_bootable_recovery-f7c00ddaf62a6a09ae257d193cadf286af750700.tar
android_bootable_recovery-f7c00ddaf62a6a09ae257d193cadf286af750700.tar.gz
android_bootable_recovery-f7c00ddaf62a6a09ae257d193cadf286af750700.tar.bz2
android_bootable_recovery-f7c00ddaf62a6a09ae257d193cadf286af750700.tar.lz
android_bootable_recovery-f7c00ddaf62a6a09ae257d193cadf286af750700.tar.xz
android_bootable_recovery-f7c00ddaf62a6a09ae257d193cadf286af750700.tar.zst
android_bootable_recovery-f7c00ddaf62a6a09ae257d193cadf286af750700.zip
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index dc066dd48..3eed7a696 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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)