Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fdaa232 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Account for the _ADRENO constant being moved."

parents 4addc005 c6c9b496

media/libstagefright/colorconversion/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -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               \

media/libstagefright/colorconversion/SoftwareRenderer.cpp

+3 −0
Original line number Diff line number Diff line
@@ -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(