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)
(cherry picked from commit d1ee5085f3bb08e5ad6dca077c311c4538f406d0)
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",
diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index 4e93df3..fc06c1d 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -45,13 +45,9 @@
}
// Socket specific parts of libcutils that are safe to statically link into an APEX.
-cc_library_static {
+cc_library {
name: "libcutils_sockets",
vendor_available: true,
- vndk: {
- enabled: true,
- support_system_process: true,
- },
recovery_available: true,
host_supported: true,
native_bridge_supported: true,
@@ -62,6 +58,7 @@
export_include_dirs: ["include"],
+ shared_libs: ["liblog"],
srcs: ["sockets.cpp"],
target: {
linux_bionic: {
