`recovery` uses more shared libraries.
Bug: 110380063
Test: `m -j installclean && mmma -j bootable/recovery` with
aosp_taimen-userdebug
Test: Build (`m -j bootimage`) and boot into recovery. Check that
`adb sideload` and `Run graphics test` both work.
Test: Run recovery_unit_test and recovery_component_test on marlin.
Change-Id: Ie6ed0e7cafa352d5faff9d1b6ccef724a0415e65
diff --git a/Android.mk b/Android.mk
index b25c1f0..3c34099 100644
--- a/Android.mk
+++ b/Android.mk
@@ -125,31 +125,32 @@
libbatterymonitor
librecovery_static_libraries := \
- libbootloader_message \
libfusesideload \
libminadbd \
libminui \
libverifier \
libotautil \
$(health_hal_static_libraries) \
- libasyncio \
- libcrypto_utils \
- libcrypto \
- libext4_utils \
- libfs_mgr \
- libpng \
- libsparse \
libvintf_recovery \
libvintf \
- libhidl-gen-utils \
- libtinyxml2 \
- libziparchive \
+
+librecovery_shared_libraries := \
+ libasyncio \
libbase \
- libutils \
+ libbootloader_message \
+ libcrypto \
+ libcrypto_utils \
libcutils \
+ libext4_utils \
+ libfs_mgr \
+ libhidl-gen-utils \
liblog \
+ libpng \
libselinux \
+ libtinyxml2 \
+ libutils \
libz \
+ libziparchive \
# librecovery (static library)
# ===============================
@@ -173,6 +174,9 @@
LOCAL_STATIC_LIBRARIES := \
$(librecovery_static_libraries)
+LOCAL_SHARED_LIBRARIES := \
+ $(librecovery_shared_libraries)
+
include $(BUILD_STATIC_LIBRARY)
# recovery (static executable)
@@ -200,6 +204,7 @@
LOCAL_SHARED_LIBRARIES := \
librecovery_ui \
+ $(librecovery_shared_libraries)
LOCAL_HAL_STATIC_LIBRARIES := libhealthd
@@ -219,7 +224,8 @@
# 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 @@
# 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)