diff --git a/linker/Android.mk b/linker/Android.mk
index c37d6db..29520f9 100644
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -19,7 +19,6 @@
 LOCAL_CLANG := true
 
 LOCAL_SRC_FILES := \
-    debugger.cpp \
     dlfcn.cpp \
     linker.cpp \
     linker_block_allocator.cpp \
@@ -76,7 +75,14 @@
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
-LOCAL_STATIC_LIBRARIES := libc_nomalloc libziparchive libutils libbase libz liblog
+LOCAL_STATIC_LIBRARIES := \
+    libc_nomalloc \
+    libziparchive \
+    libutils \
+    libbase \
+    libz \
+    liblog \
+    libdebuggerd_client
 
 # Important: The liblinker_malloc should be the last library in the list
 # to overwrite any other malloc implementations by other static libraries.