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

Merge "surfaceflinger: disable ddms debugging on pdk builds"

This commit is contained in:
Mathias Agopian 2012-03-23 16:46:54 -07:00 committed by Android (Google) Code Review
parent e1c61d3cc8 3854ed5490
commit 94ff71fd6a
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 \
LayerDim.cpp \
LayerScreenshot.cpp \
DdmConnection.cpp \
DisplayHardware/DisplayHardware.cpp \
DisplayHardware/DisplayHardwareBase.cpp \
DisplayHardware/HWComposer.cpp \
@ -49,7 +48,11 @@ LOCAL_SHARED_LIBRARIES := \
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

2
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -116,11 +116,13 @@ void SurfaceFlinger::init()
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");