summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorJin Qian <jinqian@google.com>2017-07-06 00:40:26 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-07-06 00:40:26 +0200
commit987c5a98a8d8fd924e3aea21b7e8e97779140a3a (patch)
tree3b77dc4311e746e4d1c4f97aca0dc245e09f6434 /Android.mk
parentMerge "Update ScreenRecoveryUI::Draw* function signatures." am: c8e338fa9c am: c24d97fafa (diff)
parentMerge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev (diff)
downloadandroid_bootable_recovery-987c5a98a8d8fd924e3aea21b7e8e97779140a3a.tar
android_bootable_recovery-987c5a98a8d8fd924e3aea21b7e8e97779140a3a.tar.gz
android_bootable_recovery-987c5a98a8d8fd924e3aea21b7e8e97779140a3a.tar.bz2
android_bootable_recovery-987c5a98a8d8fd924e3aea21b7e8e97779140a3a.tar.lz
android_bootable_recovery-987c5a98a8d8fd924e3aea21b7e8e97779140a3a.tar.xz
android_bootable_recovery-987c5a98a8d8fd924e3aea21b7e8e97779140a3a.tar.zst
android_bootable_recovery-987c5a98a8d8fd924e3aea21b7e8e97779140a3a.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)