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

Commit 63f165fd authored by Keun young Park's avatar Keun young Park Committed by Android (Google) Code Review
Browse files

add libsurfaceflinger_ddmconnection for PDK build 

- the library is dlopened from libsurfaceflinger
- the library built only when libnativehelper exists

Bug: 7089510
Change-Id: Ib3ea1029d7e8f6e055f4b759d0bf68f5123fa8a1
parent c3973608

services/surfaceflinger/Android.mk

+16 −0
Original line number Original line Diff line number Diff line
@@ -52,3 +52,19 @@ LOCAL_SHARED_LIBRARIES := \ 
LOCAL_MODULE:= libsurfaceflinger

LOCAL_MODULE:= libsurfaceflinger





include $(BUILD_SHARED_LIBRARY)

include $(BUILD_SHARED_LIBRARY)



###############################################################

# uses jni which may not be available in PDK

ifneq ($(wildcard libnativehelper/include),)

include $(CLEAR_VARS)

LOCAL_SRC_FILES:= \

    DdmConnection.cpp



LOCAL_SHARED_LIBRARIES := \

	libcutils \

	libdl



LOCAL_MODULE:= libsurfaceflinger_ddmconnection



include $(BUILD_SHARED_LIBRARY)

endif # libnativehelper

services/surfaceflinger/DdmConnection.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,10 @@ 




namespace android {

namespace android {





void DdmConnection_start(const char* name) {

    ALOGI("DdmConnection_start");

    DdmConnection::start(name);

}





void DdmConnection::start(const char* name) {

void DdmConnection::start(const char* name) {

    JavaVM* vm;

    JavaVM* vm;

services/surfaceflinger/DdmConnection.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,9 @@ 




namespace android {

namespace android {





// wrapper for dlsym

extern "C" void DdmConnection_start(const char* name);



class DdmConnection {

class DdmConnection {

public:

public:

    static void start(const char* name);

    static void start(const char* name);

services/surfaceflinger/SurfaceFlinger.cpp

+23 −2
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <sys/types.h>

#include <sys/types.h>

#include <errno.h>

#include <errno.h>

#include <math.h>

#include <math.h>

#include <dlfcn.h>





#include <EGL/egl.h>

#include <EGL/egl.h>

#include <GLES/gl.h>

#include <GLES/gl.h>
@@ -108,9 +109,11 @@ SurfaceFlinger::SurfaceFlinger() 
    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());

        if (!startDdmConnection()) {

            // start failed, and DDMS debugging not enabled

            mDebugDDMS = 0;

        }

    }

    }



    ALOGI_IF(mDebugRegion, "showupdates enabled");

    ALOGI_IF(mDebugRegion, "showupdates enabled");

    ALOGI_IF(mDebugDDMS, "DDMS debugging enabled");

    ALOGI_IF(mDebugDDMS, "DDMS debugging enabled");

}

}
@@ -2061,6 +2064,24 @@ void SurfaceFlinger::dumpAllLocked( 
    hw->dump(result);

    hw->dump(result);

}

}





bool SurfaceFlinger::startDdmConnection()

{

    void* libddmconnection_dso =

            dlopen("libsurfaceflinger_ddmconnection.so", RTLD_NOW);

    if (!libddmconnection_dso) {

        return false;

    }

    void (*DdmConnection_start)(const char* name);

    DdmConnection_start =

            (typeof DdmConnection_start)dlsym(libddmconnection_dso, "DdmConnection_start");

    if (!DdmConnection_start) {

        dlclose(libddmconnection_dso);

        return false;

    }

    (*DdmConnection_start)(getServiceName());

    return true;

}



status_t SurfaceFlinger::onTransact(

status_t SurfaceFlinger::onTransact(

    uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags)

    uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags)

{

{

services/surfaceflinger/SurfaceFlinger.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -388,6 +388,7 @@ private: 
    void clearStatsLocked(const Vector<String16>& args, size_t& index,

    void clearStatsLocked(const Vector<String16>& args, size_t& index,

        String8& result, char* buffer, size_t SIZE) const;

        String8& result, char* buffer, size_t SIZE) const;

    void dumpAllLocked(String8& result, char* buffer, size_t SIZE) const;

    void dumpAllLocked(String8& result, char* buffer, size_t SIZE) const;

    bool startDdmConnection();





    /* ------------------------------------------------------------------------

    /* ------------------------------------------------------------------------

     * Attributes

     * Attributes