diff options
| author | Jesse Hall <jessehall@google.com> | 2013-10-25 10:52:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-25 10:52:37 -0700 |
| commit | 96002be4bd4b8bbfecba2cc45bdf0b47f06464bc (patch) | |
| tree | 7a0e83b3f2f4b32783dc65207b0b07ea877daf36 | |
| parent | a54a8b63d191d2c1c4669f89b32c4b8a9c04cd31 (diff) | |
| parent | c354effe97be26638618e3bc0da81a3f8b384b20 (diff) | |
| download | native-96002be4bd4b8bbfecba2cc45bdf0b47f06464bc.tar.gz | |
am c354effe: Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS
* commit 'c354effe97be26638618e3bc0da81a3f8b384b20':
Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS
| -rw-r--r-- | services/surfaceflinger/Android.mk | 6 | ||||
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk index 1a8f243752..b2bc550c9e 100644 --- a/services/surfaceflinger/Android.mk +++ b/services/surfaceflinger/Android.mk @@ -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),) diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp index 0d6cbb4c95..bbe8d68a74 100644 --- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp +++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp @@ -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__) |