Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94ff71fd authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "surfaceflinger: disable ddms debugging on pdk builds"

parents e1c61d3c 3854ed54

services/surfaceflinger/Android.mk

+5 −2
Original line number Diff line number Diff line
@@ -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

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

+2 −0
Original line number Diff line number Diff line
@@ -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");