ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

surfaceflinger: disable ddms debugging on pdk builds

Browse Source 
DDMS debugging depends on non-pdk apis, disable it when a pdk
build is selected.

Change-Id: I6376b5c4cf49f2c51f35f8d567f7c6d18daf893f
This commit is contained in:
Colin Cross 2012-03-23 14:17:18 -07:00
parent 82dd490410
commit 3854ed5490
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
services/surfaceflinger/Android.mk
View File

@ -7,7 +7,6 @@ LOCAL_SRC_FILES:= \
LayerBase.cpp \ LayerBase.cpp \
LayerDim.cpp \ LayerDim.cpp \
LayerScreenshot.cpp \ LayerScreenshot.cpp \
DdmConnection.cpp \
DisplayHardware/DisplayHardware.cpp \ DisplayHardware/DisplayHardware.cpp \
DisplayHardware/DisplayHardwareBase.cpp \ DisplayHardware/DisplayHardwareBase.cpp \
DisplayHardware/HWComposer.cpp \ DisplayHardware/HWComposer.cpp \
@ -49,7 +48,11 @@ LOCAL_SHARED_LIBRARIES := \
libgui libgui
# this is only needed for DDMS debugging # 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 LOCAL_MODULE:= libsurfaceflinger

2
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -116,11 +116,13 @@ void SurfaceFlinger::init()
property_get("debug.sf.showbackground", value, "0"); property_get("debug.sf.showbackground", value, "0");
mDebugBackground = atoi(value); mDebugBackground = atoi(value);
#ifdef DDMS_DEBUGGING
property_get("debug.sf.ddms", value, "0"); property_get("debug.sf.ddms", value, "0");
mDebugDDMS = atoi(value); mDebugDDMS = atoi(value);
if (mDebugDDMS) { if (mDebugDDMS) {
DdmConnection::start(getServiceName()); DdmConnection::start(getServiceName());
} }
#endif
ALOGI_IF(mDebugRegion, "showupdates enabled"); ALOGI_IF(mDebugRegion, "showupdates enabled");
ALOGI_IF(mDebugBackground, "showbackground enabled"); ALOGI_IF(mDebugBackground, "showbackground enabled");