From a5abe7f46773b5f5bfb0c6472def8949ac212b35 Mon Sep 17 00:00:00 2001
From: Amit Pundir <amit.pundir@linaro.org>
Date: Wed, 16 Apr 2014 13:27:53 +0530
Subject: wrap juno specific hacks under TARGET_JUNO config variable

Change-Id: If938005288a3469fb76197a6206954f6ca529156
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
---
 opengl/libagl/Android.mk                              | 4 ++++
 opengl/libagl/egl.cpp                                 | 4 ++++
 services/surfaceflinger/Android.mk                    | 4 ++++
 services/surfaceflinger/RenderEngine/RenderEngine.cpp | 2 ++
 4 files changed, 14 insertions(+)

diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk
index 32bc5d97a7..a36ccec438 100644
--- a/opengl/libagl/Android.mk
+++ b/opengl/libagl/Android.mk
@@ -26,6 +26,10 @@ LOCAL_CFLAGS += -DLOG_TAG=\"libagl\"
 LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
 LOCAL_CFLAGS += -fvisibility=hidden
 
+ifeq ($(TARGET_JUNO),true)
+LOCAL_CFLAGS += -DTARGET_JUNO
+endif
+
 LOCAL_SHARED_LIBRARIES := libcutils libhardware libutils liblog libpixelflinger libETC1 libui
 LOCAL_LDLIBS := -lpthread -ldl
 
diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp
index c6b58970a3..ab4bb730a1 100644
--- a/opengl/libagl/egl.cpp
+++ b/opengl/libagl/egl.cpp
@@ -1010,6 +1010,7 @@ static config_pair_t const config_7_attribute_list[] = {
         { EGL_SURFACE_TYPE,     EGL_WINDOW_BIT|EGL_PBUFFER_BIT|EGL_PIXMAP_BIT },
 };
 
+#ifdef TARGET_JUNO
 static config_pair_t const config_8_attribute_list[] = {
         { EGL_BUFFER_SIZE,     32 },
         { EGL_ALPHA_SIZE,       8 },
@@ -1021,6 +1022,7 @@ static config_pair_t const config_8_attribute_list[] = {
         { EGL_NATIVE_VISUAL_ID, GGL_PIXEL_FORMAT_BGRA_8888 },
         { EGL_SURFACE_TYPE,     EGL_WINDOW_BIT|EGL_PBUFFER_BIT|EGL_PIXMAP_BIT },
 };
+#endif
 
 static configs_t const gConfigs[] = {
         { config_0_attribute_list, NELEM(config_0_attribute_list) },
@@ -1031,7 +1033,9 @@ static configs_t const gConfigs[] = {
         { config_5_attribute_list, NELEM(config_5_attribute_list) },
         { config_6_attribute_list, NELEM(config_6_attribute_list) },
         { config_7_attribute_list, NELEM(config_7_attribute_list) },
+#ifdef TARGET_JUNO
         { config_8_attribute_list, NELEM(config_8_attribute_list) },
+#endif
 };
 
 static config_management_t const gConfigManagement[] = {
diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index 49a017f0fc..758b23b0ae 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -83,6 +83,10 @@ else
     LOCAL_CFLAGS += -DPRESENT_TIME_OFFSET_FROM_VSYNC_NS=0
 endif
 
+ifeq ($(TARGET_JUNO),true)
+    LOCAL_CFLAGS += -DTARGET_JUNO
+endif
+
 LOCAL_CFLAGS += -fvisibility=hidden
 
 LOCAL_SHARED_LIBRARIES := \
diff --git a/services/surfaceflinger/RenderEngine/RenderEngine.cpp b/services/surfaceflinger/RenderEngine/RenderEngine.cpp
index 264e6f0b1f..f9a6f865ee 100644
--- a/services/surfaceflinger/RenderEngine/RenderEngine.cpp
+++ b/services/surfaceflinger/RenderEngine/RenderEngine.cpp
@@ -296,11 +296,13 @@ static status_t selectConfigForAttribute(EGLDisplay dpy, EGLint const* attrs,
                     return NO_ERROR;
                 }
             }
+#ifdef TARGET_JUNO
             // HACK: on Juno, force the last config to be used (see "0001-Fix-resolution-issues-for-Juno.patch")
             ALOGI("no matching config found, selecting last one");
             *outConfig = configs[n-1];
             delete [] configs;
             return NO_ERROR;
+#endif
         } else {
             // just pick the first one
             *outConfig = configs[0];
-- 
cgit v1.2.3