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

Commit c6f04666 authored by Jamie Gennis's avatar Jamie Gennis Committed by Android (Google) Code Review
Browse files

Merge "SurfaceFlinger: Move GraphicBufferAlloc to libgui"

parents 97eba890 392edd88

libs/gui/Android.mk

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

services/surfaceflinger/DisplayHardware/GraphicBufferAlloc.cpp→libs/gui/GraphicBufferAlloc.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#include <ui/GraphicBuffer.h>



#include "DisplayHardware/GraphicBufferAlloc.h"

#include <gui/GraphicBufferAlloc.h>



// ----------------------------------------------------------------------------

namespace android {

services/surfaceflinger/Android.mk

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

services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp

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