From 7d2a63afe18980bd73a7093296a520cb98035bf7 Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Mon, 13 Aug 2018 11:15:29 -0700
Subject: Reland "Build and use minadbd as a shared library."

This relands the previously reverted CL in commit
c70446ce7b4db79f296833b16ce38eb8a01d83df ("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
---
 Android.bp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Android.bp')

diff --git a/Android.bp b/Android.bp
index 99e8b652f..630c7965e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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",
     ],
 
-- 
cgit v1.2.3