diff --git a/adb/Android.bp b/adb/Android.bp
index 97bc4da2f..139ee2347 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -437,7 +437,7 @@ cc_library_static {
     },
 }
 
-cc_library_static {
+cc_library {
     name: "libadbd_services",
     defaults: ["adbd_defaults", "host_adbd_supported"],
     recovery_available: true,
@@ -474,6 +474,7 @@ cc_library_static {
         "libbase",
         "libcrypto",
         "libcrypto_utils",
+        "libcutils_sockets",
         "liblog",
     ],
 
@@ -527,6 +528,7 @@ cc_library {
         "libadb_tls_connection",
         "libadbd_auth",
         "libadbd_fs",
+        "libadbd_services",
         "libasyncio",
         "libbase",
         "libcrypto",
@@ -545,7 +547,6 @@ cc_library {
     },
 
     static_libs: [
-        "libadbd_services",
         "libcutils_sockets",
         "libdiagnose_usb",
         "libmdnssd",
diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index 3b2f30c31..dccf58880 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -49,13 +49,9 @@ cc_library_headers {
 }
 
 // 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,
@@ -66,6 +62,7 @@ cc_library_static {
 
     export_include_dirs: ["include"],
 
+    shared_libs: ["liblog"],
     srcs: ["sockets.cpp"],
     target: {
         linux_bionic: {