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

Commit 96002be4 authored by Jesse Hall's avatar Jesse Hall Committed by Android Git Automerger
Browse files

am c354effe: Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS 

* commit 'c354effe':
  Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS
parents a54a8b63 c354effe

services/surfaceflinger/Android.mk

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

	LOCAL_CFLAGS += -DTARGET_DISABLE_TRIPLE_BUFFERING

endif

endif





ifneq ($(TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS),)

ifeq ($(TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS),true)

    LOCAL_CFLAGS += -DFORCE_HWC_COPY_FOR_VIRTUAL_DISPLAYS=false

    LOCAL_CFLAGS += -DFORCE_HWC_COPY_FOR_VIRTUAL_DISPLAYS

else

    LOCAL_CFLAGS += -DFORCE_HWC_COPY_FOR_VIRTUAL_DISPLAYS=true

endif

endif





ifneq ($(NUM_FRAMEBUFFER_SURFACE_BUFFERS),)

ifneq ($(NUM_FRAMEBUFFER_SURFACE_BUFFERS),)

services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp

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

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, \

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

        mDisplayName.string(), ##__VA_ARGS__)

        mDisplayName.string(), ##__VA_ARGS__)