commit d1ee5085f3bb08e5ad6dca077c311c4538f406d0
author Josh Gao <jmgao@google.com> Mon Mar 09 15:20:55 2020 -0700
committer Josh Gao <jmgao@google.com> Wed Mar 11 23:18:41 2020 +0000
tree ffaf11c5aad0844b32846f694cb38fd9cf923f86
parent 26471f7470009ec6258af7e1846eef8cb77d9e60

adbd: make libadbd_services cc_library again.

For currently unknown reasons, sideloading is broken with
libadbd_services as a cc_library_static.

Partial revert of commit a9b62d545275ca32775a0bc5f004abe03aaa38ad.

Bug: http://b/151056300
Test: xunchang@ tested manually
Change-Id: Iaffad9c476ba0adcffc5db512ba4a7ee0fb5cb22
(cherry picked from commit 7f8a37c8c7b038f1ea1a91a0ab91c503dcf7d7e6)

adb/Android.bp

diff --git a/adb/Android.bp b/adb/Android.bp
index a26017f..e02a54e 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -429,7 +429,7 @@
     },
 }
 
-cc_library_static {
+cc_library {
     name: "libadbd_services",
     defaults: ["adbd_defaults", "host_adbd_supported"],
     recovery_available: true,
@@ -464,6 +464,7 @@
         "libbase",
         "libcrypto",
         "libcrypto_utils",
+        "libcutils_sockets",
         "liblog",
     ],
 
@@ -515,6 +516,7 @@
         "libadb_tls_connection",
         "libadbd_auth",
         "libadbd_fs",
+        "libadbd_services",
         "libasyncio",
         "libbase",
         "libcrypto",
@@ -533,7 +535,6 @@
     },
 
     static_libs: [
-        "libadbd_services",
         "libcutils_sockets",
         "libdiagnose_usb",
         "libmdnssd",