Merge "SurfaceFlinger: Move GraphicBufferAlloc to libgui"

This commit is contained in:
Jamie Gennis 2012-12-12 10:56:42 -08:00 committed by Android (Google) Code Review
commit c6f04666c2
6 changed files with 15 additions and 15 deletions

View File

@ -3,29 +3,30 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
BitTube.cpp \
BufferItemConsumer.cpp \
BufferQueue.cpp \
ConsumerBase.cpp \
CpuConsumer.cpp \
DisplayEventReceiver.cpp \
DummyConsumer.cpp \
GraphicBufferAlloc.cpp \
GuiConfig.cpp \
IDisplayEventConnection.cpp \
IGraphicBufferAlloc.cpp \
ISensorEventConnection.cpp \
ISensorServer.cpp \
ISurface.cpp \
ISurfaceComposer.cpp \
ISurfaceComposerClient.cpp \
ISurfaceTexture.cpp \
LayerState.cpp \
Sensor.cpp \
SensorEventQueue.cpp \
SensorManager.cpp \
SurfaceTexture.cpp \
SurfaceTextureClient.cpp \
ISurfaceComposer.cpp \
ISurface.cpp \
ISurfaceComposerClient.cpp \
IGraphicBufferAlloc.cpp \
LayerState.cpp \
Surface.cpp \
SurfaceComposerClient.cpp \
DummyConsumer.cpp \
CpuConsumer.cpp \
BufferItemConsumer.cpp \
GuiConfig.cpp
SurfaceTexture.cpp \
SurfaceTextureClient.cpp \
LOCAL_SHARED_LIBRARIES := \
libbinder \

View File

@ -19,7 +19,7 @@
#include <ui/GraphicBuffer.h>
#include "DisplayHardware/GraphicBufferAlloc.h"
#include <gui/GraphicBufferAlloc.h>
// ----------------------------------------------------------------------------
namespace android {

View File

@ -11,7 +11,6 @@ LOCAL_SRC_FILES:= \
LayerDim.cpp \
LayerScreenshot.cpp \
DisplayHardware/FramebufferSurface.cpp \
DisplayHardware/GraphicBufferAlloc.cpp \
DisplayHardware/HWComposer.cpp \
DisplayHardware/PowerHAL.cpp \
GLExtensions.cpp \

View File

@ -30,10 +30,10 @@
#include <hardware/hardware.h>
#include <gui/SurfaceTextureClient.h>
#include <gui/GraphicBufferAlloc.h>
#include <ui/GraphicBuffer.h>
#include "DisplayHardware/FramebufferSurface.h"
#include "DisplayHardware/GraphicBufferAlloc.h"
#include "DisplayHardware/HWComposer.h"
#ifndef NUM_FRAMEBUFFER_SURFACE_BUFFERS

View File

@ -40,6 +40,7 @@
#include <gui/GuiConfig.h>
#include <gui/IDisplayEventConnection.h>
#include <gui/SurfaceTextureClient.h>
#include <gui/GraphicBufferAlloc.h>
#include <ui/GraphicBufferAllocator.h>
#include <ui/PixelFormat.h>
@ -65,7 +66,6 @@
#include "SurfaceFlinger.h"
#include "DisplayHardware/FramebufferSurface.h"
#include "DisplayHardware/GraphicBufferAlloc.h"
#include "DisplayHardware/HWComposer.h"