From c6c9b496aa360e53fca3497964224611aca29e9f Mon Sep 17 00:00:00 2001
From: Jamie Gennis <jgennis@google.com>
Date: Mon, 23 Aug 2010 14:03:49 -0700
Subject: Account for the _ADRENO constant being moved.

Change-Id: I443e2028c06f8b03e864525365c5c38de79314fe
---
 media/libstagefright/colorconversion/Android.mk           | 3 ++-
 media/libstagefright/colorconversion/SoftwareRenderer.cpp | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/media/libstagefright/colorconversion/Android.mk b/media/libstagefright/colorconversion/Android.mk
index 4a924c8..2b63235 100644
--- a/media/libstagefright/colorconversion/Android.mk
+++ b/media/libstagefright/colorconversion/Android.mk
@@ -6,7 +6,8 @@ LOCAL_SRC_FILES:=                     \
         SoftwareRenderer.cpp
 
 LOCAL_C_INCLUDES := \
-        $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include
+        $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
+        $(TOP)/hardware/msm7k
 
 LOCAL_SHARED_LIBRARIES :=       \
         libbinder               \
diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
index 6d1dd25..507fa5a 100644
--- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp
+++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
@@ -26,6 +26,9 @@
 #include <ui/android_native_buffer.h>
 #include <ui/GraphicBufferMapper.h>
 
+// XXX: Temporary hack to allow referencing the _ADRENO pixel format here.
+#include <libgralloc-qsd8k/gralloc_priv.h>
+
 namespace android {
 
 SoftwareRenderer::SoftwareRenderer(
-- 
cgit v1.1