commit 82252a9a732c7325166c36589c1dfa9f2cb8ac04
author Andreas Huber <andih@google.com> Mon Aug 23 14:08:02 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 23 14:08:02 2010 -0700
tree fb2e0f75fe75cef5ea2f51ffe883a5659a2ec6dc
parent fec932fda5b69cc8b572063decc0f64faa36ff4a
parent 3e135cf939b4baf9902fe24fb0e50528e62c10bd

Merge "Account for the _ADRENO constant being moved."

media/libstagefright/colorconversion/Android.mk

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 @@
         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               \

media/libstagefright/colorconversion/SoftwareRenderer.cpp

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(