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

Commit 2b5dd406 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

Fix include dependencies 

Some headers included other headers they didn’t
need. This is trying to reduce the dependencies
of Surface.h / Surface.cpp on the rest of the
world.

Test: compiled
Bug: not applicable
Change-Id: Ibb5de1308a387394a1367638c3b7f26b5549ce6a
parent 39fe1d87

include/gui/BufferItem.h

+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 
#ifndef ANDROID_GUI_BUFFERITEM_H

#define ANDROID_GUI_BUFFERITEM_H



#include <EGL/egl.h>

#include <EGL/eglext.h>



#include <ui/FenceTime.h>

#include <ui/Rect.h>

#include <ui/Region.h>

include/gui/ISurfaceComposer.h

+4 −4
Original line number Diff line number Diff line
@@ -28,9 +28,7 @@ 
#include <binder/IInterface.h>



#include <ui/FrameStats.h>



#include <gui/IGraphicBufferAlloc.h>

#include <gui/ISurfaceComposerClient.h>

#include <ui/PixelFormat.h>



#include <vector>
@@ -43,7 +41,9 @@ struct DisplayInfo; 
struct DisplayStatInfo;

class HdrCapabilities;

class IDisplayEventConnection;

class IMemoryHeap;

class IGraphicBufferAlloc;

class IGraphicBufferProducer;

class ISurfaceComposerClient;

class Rect;

enum class FrameEvent;

include/gui/Surface.h

+6 −6
Original line number Diff line number Diff line
@@ -17,17 +17,17 @@ 
#ifndef ANDROID_GUI_SURFACE_H

#define ANDROID_GUI_SURFACE_H



#include <binder/Parcelable.h>



#include <gui/IGraphicBufferProducer.h>

#include <gui/BufferQueue.h>

#include <gui/BufferQueueDefs.h>



#include <ui/ANativeObjectBase.h>

#include <ui/Region.h>



#include <binder/Parcelable.h>



#include <utils/Condition.h>

#include <utils/Mutex.h>

#include <utils/RefBase.h>

#include <utils/threads.h>

#include <utils/KeyedVector.h>



struct ANativeWindow_Buffer;
@@ -251,7 +251,7 @@ public: 
    virtual int attachBuffer(ANativeWindowBuffer*);



protected:

    enum { NUM_BUFFER_SLOTS = BufferQueue::NUM_BUFFER_SLOTS };

    enum { NUM_BUFFER_SLOTS = BufferQueueDefs::NUM_BUFFER_SLOTS };

    enum { DEFAULT_FORMAT = PIXEL_FORMAT_RGBA_8888 };



    void querySupportedTimestampsLocked() const;

include/private/gui/ComposerService.h

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ namespace android { 


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



class IMemoryHeap;

class ISurfaceComposer;



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

libs/gui/ISurfaceComposer.cpp

+3 −4
Original line number Diff line number Diff line
@@ -25,10 +25,11 @@ 
#include <binder/IPCThreadState.h>

#include <binder/IServiceManager.h>



#include <gui/BitTube.h>

#include <gui/IDisplayEventConnection.h>

#include <gui/ISurfaceComposer.h>

#include <gui/IGraphicBufferAlloc.h>

#include <gui/IGraphicBufferProducer.h>

#include <gui/ISurfaceComposer.h>

#include <gui/ISurfaceComposerClient.h>



#include <private/gui/LayerState.h>
@@ -44,8 +45,6 @@ 


namespace android {



class IDisplayEventConnection;



class BpSurfaceComposer : public BpInterface<ISurfaceComposer>

{

public: