diff options
| author | Andreas Huber <andih@google.com> | 2010-08-23 14:08:02 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-23 14:08:02 -0700 |
| commit | 7fdaa2329e755c0e5c25724a43b8c361b88e9623 (patch) | |
| tree | 0a78dee45d6e3acad48a7ab11db432919db67c88 | |
| parent | 4addc005ae312f6379086d293492fec00e139eae (diff) | |
| parent | c6c9b496aa360e53fca3497964224611aca29e9f (diff) | |
| download | frameworks_base-7fdaa2329e755c0e5c25724a43b8c361b88e9623.zip frameworks_base-7fdaa2329e755c0e5c25724a43b8c361b88e9623.tar.gz frameworks_base-7fdaa2329e755c0e5c25724a43b8c361b88e9623.tar.bz2 | |
Merge "Account for the _ADRENO constant being moved."
| -rw-r--r-- | media/libstagefright/colorconversion/Android.mk | 3 | ||||
| -rw-r--r-- | media/libstagefright/colorconversion/SoftwareRenderer.cpp | 3 |
2 files changed, 5 insertions, 1 deletions
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( |