diff options
author | Tao Bao <tbao@google.com> | 2018-08-10 21:07:26 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-10 21:07:26 +0200 |
commit | f8f53fd04c02173b3e6b7e2accac0f7ace130d56 (patch) | |
tree | b759475311552befd6668665871e629f5177c190 /Android.mk | |
parent | Merge "Revert "Build and use minadbd as a shared library."" (diff) | |
parent | Merge "`recovery` uses more shared libraries." (diff) | |
download | android_bootable_recovery-f8f53fd04c02173b3e6b7e2accac0f7ace130d56.tar android_bootable_recovery-f8f53fd04c02173b3e6b7e2accac0f7ace130d56.tar.gz android_bootable_recovery-f8f53fd04c02173b3e6b7e2accac0f7ace130d56.tar.bz2 android_bootable_recovery-f8f53fd04c02173b3e6b7e2accac0f7ace130d56.tar.lz android_bootable_recovery-f8f53fd04c02173b3e6b7e2accac0f7ace130d56.tar.xz android_bootable_recovery-f8f53fd04c02173b3e6b7e2accac0f7ace130d56.tar.zst android_bootable_recovery-f8f53fd04c02173b3e6b7e2accac0f7ace130d56.zip |
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 43 |
1 files changed, 31 insertions, 12 deletions
diff --git a/Android.mk b/Android.mk index b25c1f07a..3c340999f 100644 --- a/Android.mk +++ b/Android.mk @@ -125,31 +125,32 @@ health_hal_static_libraries := \ libbatterymonitor librecovery_static_libraries := \ - libbootloader_message \ libfusesideload \ libminadbd \ libminui \ libverifier \ libotautil \ $(health_hal_static_libraries) \ + libvintf_recovery \ + libvintf \ + +librecovery_shared_libraries := \ libasyncio \ - libcrypto_utils \ + libbase \ + libbootloader_message \ libcrypto \ + libcrypto_utils \ + libcutils \ libext4_utils \ libfs_mgr \ - libpng \ - libsparse \ - libvintf_recovery \ - libvintf \ libhidl-gen-utils \ - libtinyxml2 \ - libziparchive \ - libbase \ - libutils \ - libcutils \ liblog \ + libpng \ libselinux \ + libtinyxml2 \ + libutils \ libz \ + libziparchive \ # librecovery (static library) # =============================== @@ -173,6 +174,9 @@ LOCAL_MODULE := librecovery LOCAL_STATIC_LIBRARIES := \ $(librecovery_static_libraries) +LOCAL_SHARED_LIBRARIES := \ + $(librecovery_shared_libraries) + include $(BUILD_STATIC_LIBRARY) # recovery (static executable) @@ -200,6 +204,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \ librecovery_ui \ + $(librecovery_shared_libraries) LOCAL_HAL_STATIC_LIBRARIES := libhealthd @@ -219,7 +224,8 @@ endif # e2fsck is needed for adb remount -R. ifeq ($(BOARD_EXT4_SHARE_DUP_BLOCKS),true) ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) -LOCAL_REQUIRED_MODULES += e2fsck_static +LOCAL_REQUIRED_MODULES += \ + e2fsck_static endif endif @@ -235,10 +241,23 @@ LOCAL_REQUIRED_MODULES += \ # TODO(b/110380063): Explicitly install the following shared libraries to recovery, until `recovery` # module is built with Soong (with `recovery: true` flag). LOCAL_REQUIRED_MODULES += \ + libasyncio.recovery \ libbase.recovery \ + libbootloader_message.recovery \ + libcrypto.recovery \ + libcrypto_utils.recovery \ + libcutils.recovery \ + libext4_utils.recovery \ + libfs_mgr.recovery \ + libhidl-gen-utils.recovery \ liblog.recovery \ libpng.recovery \ + libselinux.recovery \ + libsparse.recovery \ + libtinyxml2.recovery \ + libutils.recovery \ libz.recovery \ + libziparchive.recovery \ include $(BUILD_EXECUTABLE) |