commit 94ff71fd6a4eeb36f02d277a0d2c96230b5c9ee6
author Mathias Agopian <mathias@google.com> Fri Mar 23 16:46:54 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 23 16:46:54 2012 -0700
tree c86ad7767133f7e74914b8eff9ed8bc0da74766f
parent e1c61d3cc8458ce9a15d8109f728e60f5248939d
parent 3854ed549012f2abf8fea7b0e6db30b104ea5547

Merge "surfaceflinger: disable ddms debugging on pdk builds"

services/surfaceflinger/Android.mk

diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index aa1e426..702b52b 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -7,7 +7,6 @@
     LayerBase.cpp                           \
     LayerDim.cpp                            \
     LayerScreenshot.cpp                     \
-    DdmConnection.cpp                       \
     DisplayHardware/DisplayHardware.cpp     \
     DisplayHardware/DisplayHardwareBase.cpp \
     DisplayHardware/HWComposer.cpp          \
@@ -49,7 +48,11 @@
 	libgui
 
 # this is only needed for DDMS debugging
-LOCAL_SHARED_LIBRARIES += libdvm libandroid_runtime
+ifneq ($(TARGET_BUILD_PDK), true)
+	LOCAL_SHARED_LIBRARIES += libdvm libandroid_runtime
+	LOCAL_CLFAGS += -DDDMS_DEBUGGING
+	LOCAL_SRC_FILES += DdmConnection.cpp
+endif
 
 LOCAL_MODULE:= libsurfaceflinger
 

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 03e272d..fe39584 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -116,11 +116,13 @@
     property_get("debug.sf.showbackground", value, "0");
     mDebugBackground = atoi(value);
 
+#ifdef DDMS_DEBUGGING
     property_get("debug.sf.ddms", value, "0");
     mDebugDDMS = atoi(value);
     if (mDebugDDMS) {
         DdmConnection::start(getServiceName());
     }
+#endif
 
     ALOGI_IF(mDebugRegion,       "showupdates enabled");
     ALOGI_IF(mDebugBackground,   "showbackground enabled");