From 272e6ecb11a3a9c0de87d49e65704f2c212227cf Mon Sep 17 00:00:00 2001 From: Saurabh Shah Date: Thu, 5 Apr 2012 17:22:31 -0700 Subject: [PATCH] Fix heap corruption in overlay clients. Fix heap corruption in overlay clients, caused by missing compilation flags. All libraries using overlayLib.h should have flags used for conditional member declaration in overlay. CRs-fixed: 342959 (cherry picked from commit 42120b29500560ebedbd897e2e7adf7369eb0a21) Change-Id: Idf613861c4dc67e96ecadf7ce7e37472cb4e4daf --- libgralloc/Android.mk | 4 ++++ libhwcomposer/Android.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/libgralloc/Android.mk b/libgralloc/Android.mk index e893259..57010aa 100644 --- a/libgralloc/Android.mk +++ b/libgralloc/Android.mk @@ -52,6 +52,10 @@ endif ifeq ($(TARGET_GRALLOC_USES_ASHMEM),true) LOCAL_CFLAGS += -DUSE_ASHMEM endif +ifeq ($(TARGET_USES_POST_PROCESSING),true) +LOCAL_CFLAGS += -DUSES_POST_PROCESSING +LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/pp/inc +endif include $(BUILD_SHARED_LIBRARY) diff --git a/libhwcomposer/Android.mk b/libhwcomposer/Android.mk index e20a853..f9e34db 100644 --- a/libhwcomposer/Android.mk +++ b/libhwcomposer/Android.mk @@ -34,5 +34,9 @@ endif ifeq ($(TARGET_USE_HDMI_AS_PRIMARY),true) LOCAL_CFLAGS += -DHDMI_AS_PRIMARY endif +ifeq ($(TARGET_USES_POST_PROCESSING),true) +LOCAL_CFLAGS += -DUSES_POST_PROCESSING +LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/pp/inc +endif LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY)