diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index 1f7affd..dd0dc16 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -3,6 +3,7 @@
 
 LOCAL_SRC_FILES:= \
     Client.cpp                              \
+    DdmConnection.cpp                       \
     DisplayDevice.cpp                       \
     EventThread.cpp                         \
     Layer.cpp                               \
@@ -39,6 +40,7 @@
 
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \
+	libdl \
 	libhardware \
 	libutils \
 	libEGL \
@@ -47,13 +49,6 @@
 	libui \
 	libgui
 
-# this is only needed for DDMS debugging
-ifneq ($(TARGET_BUILD_PDK),true)
-	LOCAL_SHARED_LIBRARIES += libdvm libandroid_runtime
-	LOCAL_CFLAGS += -DDDMS_DEBUGGING
-	LOCAL_SRC_FILES += DdmConnection.cpp
-endif
-
 LOCAL_MODULE:= libsurfaceflinger
 
 include $(BUILD_SHARED_LIBRARY)