Reland "Build and use minadbd as a shared library."

This relands the previously reverted CL in commit
c70446ce7b ("Build and use minadbd as a
shared library."). `recovery` has been built with Soong, so the previous
concern (unintentionally installing `libminadbd_services.so` to normal
system image) no longer holds.

Note that `reocvery` can't use `libminadbd_services.a`, as functions
like `daemon_service_to_fd()` (needed by `libadbd.so`) won't be linked
into `recovery`.

This CL moves the dependency of `libminadbd_services` from `librecovery`
into `recovery`, as only the latter actually relies on it (via
`recovery_main.cpp`). Note that we no longer need to list the transitive
dependency on `libadbd` or `libasyncio`.

Bug: 112494634
Test: `mmma -j bootable/recovery`
Test: Build and boot into recovery with aosp_taimen-userdebug. Verify that
      sideloading keeps working.
Test: `build/soong/build_test.bash --dist`
Change-Id: Ic086470b86d6770bede317e0f5534f608fa7b7d2
This commit is contained in:
Tao Bao 2018-08-13 11:15:29 -07:00
parent 1914bd0f4b
commit 7d2a63afe1
3 changed files with 10 additions and 13 deletions

View file

@ -104,7 +104,6 @@ cc_defaults {
],
shared_libs: [
"libasyncio",
"libbase",
"libbootloader_message",
"libcrypto",
@ -125,7 +124,6 @@ cc_defaults {
],
static_libs: [
"libminadbd",
"libminui",
"libverifier",
"libotautil",
@ -206,6 +204,7 @@ cc_binary {
],
shared_libs: [
"libminadbd_services",
"librecovery_ui",
],

View file

@ -26,8 +26,10 @@ cc_defaults {
],
}
cc_library_static {
name: "libminadbd",
// `libminadbd_services` is analogous to the `libadbd_services` for regular `adbd`, but providing
// the sideload service only.
cc_library {
name: "libminadbd_services",
recovery_available: true,
defaults: [
@ -40,14 +42,11 @@ cc_library_static {
"minadbd_services.cpp",
],
static_libs: [
"libfusesideload",
shared_libs: [
"libadbd",
"libbase",
"libcrypto",
],
whole_static_libs: [
"libadbd",
"libfusesideload",
],
}
@ -63,8 +62,9 @@ cc_test {
],
static_libs: [
"libminadbd_services",
"libadbd",
"libBionicGtestMain",
"libminadbd",
],
shared_libs: [

View file

@ -170,14 +170,12 @@ librecovery_static_libraries := \
librecovery \
libbootloader_message \
libfusesideload \
libminadbd \
librecovery_ui_default \
librecovery_ui \
libminui \
libverifier \
libotautil \
$(health_hal_static_libraries) \
libasyncio \
libcrypto_utils \
libcrypto \
libext4_utils \