diff --git a/adb/Android.bp b/adb/Android.bp
index d35c3a3..2a9a579 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -277,7 +277,7 @@
     },
 }
 
-cc_library {
+cc_library_static {
     name: "libadbd",
     defaults: ["adb_defaults"],
     recovery_available: true,
@@ -288,36 +288,16 @@
         "daemon/auth.cpp",
         "daemon/usb.cpp",
         "daemon/jdwp_service.cpp",
-        "daemon/mdns.cpp",
-        "daemon/file_sync_service.cpp",
-        "daemon/framebuffer_service.cpp",
-        "daemon/remount_service.cpp",
-        "daemon/set_verity_enable_state_service.cpp",
-        "daemon/shell_service.cpp",
-        "shell_service_protocol.cpp",
     ],
 
     static_libs: [
-        "libavb_user",
-        "libdiagnose_usb",
-        "libfec",
-        "libfec_rs",
-        "libfs_mgr",
-        "libmdnssd",
-        "libqemu_pipe",
-        "libsquashfs_utils",
-        "libselinux",
-    ],
-
-    shared_libs: [
         "libasyncio",
         "libbootloader_message",
-        "libbase",
         "libcrypto_utils",
         "libcrypto",
-        "libcutils",
-        "libext4_utils",
-        "liblog",
+        "libdiagnose_usb",
+        "libqemu_pipe",
+        "libbase",
     ],
 
     export_include_dirs: [
@@ -333,6 +313,13 @@
 
     srcs: [
         "daemon/main.cpp",
+        "daemon/mdns.cpp",
+        "daemon/file_sync_service.cpp",
+        "daemon/framebuffer_service.cpp",
+        "daemon/remount_service.cpp",
+        "daemon/set_verity_enable_state_service.cpp",
+        "daemon/shell_service.cpp",
+        "shell_service_protocol.cpp",
     ],
 
     cflags: [
@@ -344,19 +331,27 @@
         keep_symbols: true,
     },
 
-    shared_libs: [
+    static_libs: [
         "libadbd",
         "libasyncio",
-        "libbase",
+        "libavb_user",
         "libbootloader_message",
-        "libcap",
         "libcrypto_utils",
         "libcrypto",
-        "libcutils",
-        "libext4_utils",
+        "libdiagnose_usb",
+        "libfec",
+        "libfec_rs",
+        "libfs_mgr",
         "liblog",
+        "libext4_utils",
+        "libmdnssd",
         "libminijail",
         "libselinux",
+        "libsquashfs_utils",
+        "libqemu_pipe",
+
+        "libbase",
+        "libcutils",
     ],
 }
 
diff --git a/adb/transport_local.cpp b/adb/transport_local.cpp
index abd2c31..fa38238 100644
--- a/adb/transport_local.cpp
+++ b/adb/transport_local.cpp
@@ -428,10 +428,6 @@
     std::thread(func, port).detach();
 }
 
-std::string getEmulatorSerialString(int console_port) {
-    return android::base::StringPrintf("emulator-%d", console_port);
-}
-
 #if ADB_HOST
 struct EmulatorConnection : public FdConnection {
     EmulatorConnection(unique_fd fd, int local_port)
@@ -466,6 +462,10 @@
     return it->second;
 }
 
+std::string getEmulatorSerialString(int console_port) {
+    return android::base::StringPrintf("emulator-%d", console_port);
+}
+
 atransport* find_emulator_transport_by_adb_port(int adb_port) {
     std::lock_guard<std::mutex> lock(local_transports_lock);
     return find_emulator_transport_by_adb_port_locked(adb_port);