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

Commit cbc184fb authored by Peiyong Lin's avatar Peiyong Lin
Browse files

[RenderEngine] Add Android.bp to RenderEngine 

Besides make RenderEngine as static library, this patch also intentionally
moves all header files to public includable directory. The header files will be
structured better in the progress of stripping off GL implementation out of
public interfaces.

BUG: 112585051
Test: Build, flash and do display validation
Change-Id: Ife6e27896a2ccee6a23781a43ebc508e2587eb71
parent 21be4b6c

services/surfaceflinger/Android.bp

+2 −10
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ cc_defaults { 
        "libvulkan",

    ],

    static_libs: [

        "librenderengine",

        "libserviceutils",

        "libtrace_proto",

        "libvkjson",
@@ -66,6 +67,7 @@ cc_defaults { 
        "android.hardware.graphics.composer@2.2-command-buffer",

    ],

    export_static_lib_headers: [

        "librenderengine",

        "libserviceutils",

    ],

    export_shared_lib_headers: [
@@ -118,16 +120,6 @@ filegroup { 
        "LayerVector.cpp",

        "MonitoredProducer.cpp",

        "RenderArea.cpp",

        "RenderEngine/Description.cpp",

        "RenderEngine/GLES20RenderEngine.cpp",

        "RenderEngine/GLExtensions.cpp",

        "RenderEngine/Image.cpp",

        "RenderEngine/Mesh.cpp",

        "RenderEngine/Program.cpp",

        "RenderEngine/ProgramCache.cpp",

        "RenderEngine/RenderEngine.cpp",

        "RenderEngine/Surface.cpp",

        "RenderEngine/Texture.cpp",

        "Scheduler/DispSync.cpp",

        "Scheduler/DispSyncSource.cpp",

        "Scheduler/EventControlThread.cpp",

services/surfaceflinger/BufferLayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include "DisplayDevice.h"

#include "LayerRejecter.h"



#include "RenderEngine/RenderEngine.h"

#include <renderengine/RenderEngine.h>



#include <gui/BufferItem.h>

#include <gui/BufferQueue.h>

services/surfaceflinger/BufferLayer.h

+2 −3
Original line number Diff line number Diff line
@@ -24,13 +24,12 @@ 
#include "FrameTracker.h"

#include "LayerVector.h"

#include "MonitoredProducer.h"

#include "RenderEngine/Mesh.h"

#include "RenderEngine/Texture.h"

#include "SurfaceFlinger.h"



#include <gui/ISurfaceComposerClient.h>

#include <gui/LayerState.h>



#include <renderengine/Mesh.h>

#include <renderengine/Texture.h>

#include <ui/FrameStats.h>

#include <ui/GraphicBuffer.h>

#include <ui/PixelFormat.h>

services/surfaceflinger/BufferLayerConsumer.cpp

+2 −5
Original line number Diff line number Diff line
@@ -20,10 +20,7 @@ 
//#define LOG_NDEBUG 0



#include "BufferLayerConsumer.h"



#include "Layer.h"

#include "RenderEngine/Image.h"

#include "RenderEngine/RenderEngine.h"

#include "Scheduler/DispSync.h"



#include <inttypes.h>
@@ -38,9 +35,9 @@ 
#include <gui/GLConsumer.h>

#include <gui/ISurfaceComposer.h>

#include <gui/SurfaceComposerClient.h>



#include <private/gui/ComposerService.h>



#include <renderengine/Image.h>

#include <renderengine/RenderEngine.h>

#include <utils/Log.h>

#include <utils/String8.h>

#include <utils/Trace.h>

services/surfaceflinger/BufferStateLayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ 
#define ATRACE_TAG ATRACE_TAG_GRAPHICS



#include "BufferStateLayer.h"

#include "RenderEngine/Image.h"



#include <private/gui/SyncFeatures.h>

#include <renderengine/Image.h>



namespace android {