commit feaed06078bb51eabb3f6860aef9279e6c30d7b3
author Naseer Ahmed <naseer@codeaurora.org> Tue Jan 17 15:34:02 2017 -0500
committer Naseer Ahmed <naseer@codeaurora.org> Mon Jan 23 15:36:04 2017 -0500
tree 0757c38d7a7a8b3f54ed98f9de28d3f137a2e4ea
parent 6c44d14e1814e6741a7e7f00580c19fa7d3235db

gpu_tonemapper: Fix compilation issue with GraphicBuffer

Handle different version of GraphicBuffer with a compile time
flag.

CRs-Fixed: 1111917
Change-Id: I11aa6d64a8e61a4d7658cb5f924ee4dc38c40bc9

gpu_tonemapper/Android.mk

diff --git a/gpu_tonemapper/Android.mk b/gpu_tonemapper/Android.mk
index 9ae3840..4f716d2 100644
--- a/gpu_tonemapper/Android.mk
+++ b/gpu_tonemapper/Android.mk
@@ -11,7 +11,7 @@
 LOCAL_MODULE_TAGS         := optional
 LOCAL_C_INCLUDES          := $(TARGET_OUT_HEADERS)/qcom/display/
 
-LOCAL_CFLAGS              := -Wno-missing-field-initializers -Wall \
+LOCAL_CFLAGS              := $(version_flag) -Wno-missing-field-initializers -Wall \
                              -Wno-unused-parameter -std=c++11 -DLOG_TAG=\"GPU_TONEMAPPER\"
 
 LOCAL_SRC_FILES           := TonemapFactory.cpp \

gpu_tonemapper/EGLImageWrapper.cpp

diff --git a/gpu_tonemapper/EGLImageWrapper.cpp b/gpu_tonemapper/EGLImageWrapper.cpp
index 298475f..1d5d57e 100644
--- a/gpu_tonemapper/EGLImageWrapper.cpp
+++ b/gpu_tonemapper/EGLImageWrapper.cpp
@@ -41,8 +41,12 @@
     }
 
     android::sp<android::GraphicBuffer> graphicBuffer =
-        new android::GraphicBuffer(src->width, src->height, src->format, flags,
-                                   src->width /*src->stride*/, native_handle, false);
+        new android::GraphicBuffer(src->width, src->height, src->format,
+#ifndef __NOUGAT__
+                                   1, // Layer count
+#endif
+                                   flags, src->width /*src->stride*/,
+                                   native_handle, false);
 
     result = new EGLImageBuffer(graphicBuffer);