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

Commit c354effe authored by Jesse Hall's avatar Jesse Hall Committed by Iliyan Malchev
Browse files

Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS 

related to b/8316155 - Implement HWComposer 1.3 w/ virtual display support
Change-Id: I2dc8d65a74174aa833cc491264f97f1f2df49307
parent 93fcb823

services/surfaceflinger/Android.mk

+2 −4
Original line number Diff line number Diff line
@@ -51,10 +51,8 @@ ifeq ($(TARGET_DISABLE_TRIPLE_BUFFERING),true) 
	LOCAL_CFLAGS += -DTARGET_DISABLE_TRIPLE_BUFFERING

endif



ifneq ($(TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS),)

    LOCAL_CFLAGS += -DFORCE_HWC_COPY_FOR_VIRTUAL_DISPLAYS=false

else

    LOCAL_CFLAGS += -DFORCE_HWC_COPY_FOR_VIRTUAL_DISPLAYS=true

ifeq ($(TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS),true)

    LOCAL_CFLAGS += -DFORCE_HWC_COPY_FOR_VIRTUAL_DISPLAYS

endif



ifneq ($(NUM_FRAMEBUFFER_SURFACE_BUFFERS),)

services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp

+5 −1
Original line number Diff line number Diff line
@@ -22,7 +22,11 @@ 
namespace android {

// ---------------------------------------------------------------------------



static bool sForceHwcCopy = FORCE_HWC_COPY_FOR_VIRTUAL_DISPLAYS;

#if defined(FORCE_HWC_COPY_FOR_VIRTUAL_DISPLAYS)

static const bool sForceHwcCopy = true;

#else

static const bool sForceHwcCopy = false;

#endif



#define VDS_LOGE(msg, ...) ALOGE("[%s] "msg, \

        mDisplayName.string(), ##__VA_ARGS__)