diff options
| author | Jin Qian <jinqian@google.com> | 2017-07-21 21:06:06 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-21 21:06:06 +0200 |
| commit | 92036417425386d103ce1550c1c95f6e695129cb (patch) | |
| tree | f71477d34184063bacf632e5e2df409bd7f47f64 /Android.mk | |
| parent | Merge "Fix the android-cloexec-* warnings in bootable/recovery" (diff) | |
| parent | Merge "recovery: replace make_ext4 with e2fsprogs" (diff) | |
| download | android_bootable_recovery-92036417425386d103ce1550c1c95f6e695129cb.tar android_bootable_recovery-92036417425386d103ce1550c1c95f6e695129cb.tar.gz android_bootable_recovery-92036417425386d103ce1550c1c95f6e695129cb.tar.bz2 android_bootable_recovery-92036417425386d103ce1550c1c95f6e695129cb.tar.lz android_bootable_recovery-92036417425386d103ce1550c1c95f6e695129cb.tar.xz android_bootable_recovery-92036417425386d103ce1550c1c95f6e695129cb.tar.zst android_bootable_recovery-92036417425386d103ce1550c1c95f6e695129cb.zip | |
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 8 |
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) |