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

Commit e068ad5d authored by toastcfh's avatar toastcfh
Browse files

frameworks: base: clean up after merge of qcom stuffs and mass ifdeforama 

Change-Id: I339eed86d842621013be1d3672552bdec5a1b167
parent fc330a6b

libs/gui/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libGLESv2



ifeq ($(BOARD_USES_QCOM_HARDWARE),true)

LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES += \

        libQcomUI

LOCAL_C_INCLUDES := hardware/qcom/display/libqcomui

LOCAL_CFLAGS += -DQCOM_HARDWARE

libs/gui/SurfaceTexture.cpp

+3 −1
Original line number Diff line number Diff line
@@ -902,7 +902,9 @@ status_t SurfaceTexture::updateTexImage() { 
        if (failed) {

            return -EINVAL;

        }



#ifdef QCOM_HARDWARE

      }

#endif

        if (mCurrentTexture != INVALID_BUFFER_SLOT) {

            if (mUseFenceSync) {

                EGLSyncKHR fence = eglCreateSyncKHR(dpy, EGL_SYNC_FENCE_KHR,

libs/hwui/OpenGLRenderer.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public: 
    virtual ~OpenGLRenderer();



    virtual void setViewport(int width, int height);

    void getViewport(int &width, int &height);

    ANDROID_API void getViewport(int &width, int &height);



    ANDROID_API void prepare(bool opaque);

    virtual void prepareDirty(float left, float top, float right, float bottom, bool opaque);

services/surfaceflinger/Android.mk

+7 −6
Original line number Diff line number Diff line
@@ -30,12 +30,6 @@ ifeq ($(TARGET_BOARD_PLATFORM), s5pc110) 
	LOCAL_CFLAGS += -DHAS_CONTEXT_PRIORITY -DNEVER_DEFAULT_TO_ASYNC_MODE

	LOCAL_CFLAGS += -DREFRESH_RATE=56

endif

ifeq ($(BOARD_USES_QCOM_HARDWARE),true)

LOCAL_SHARED_LIBRARIES := \

	libQcomUI

LOCAL_C_INCLUDES += hardware/qcom/display/libqcomui

LOCAL_CFLAGS += -DQCOM_HARDWARE

endif



LOCAL_SHARED_LIBRARIES := \

	libcutils \
@@ -61,6 +55,13 @@ LOCAL_C_INCLUDES := \ 


LOCAL_C_INCLUDES += hardware/libhardware/modules/gralloc



ifeq ($(BOARD_USES_QCOM_HARDWARE),true)

LOCAL_SHARED_LIBRARIES += \

	libQcomUI

LOCAL_C_INCLUDES += hardware/qcom/display/libqcomui

LOCAL_CFLAGS += -DQCOM_HARDWARE

endif



LOCAL_MODULE:= libsurfaceflinger



include $(BUILD_SHARED_LIBRARY)