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

Commit 079ec332 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SF: Set up libscheduler headers"

parents 99680a73 f6b4ba66

services/surfaceflinger/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -78,10 +78,10 @@ cc_defaults { 
        "libframetimeline",

        "libperfetto_client_experimental",

        "librenderengine",

        "libscheduler",

        "libserviceutils",

        "libtonemap",

        "libtrace_proto",

        "libaidlcommonsupport",

    ],

    header_libs: [

        "android.hardware.graphics.composer@2.1-command-buffer",

services/surfaceflinger/DisplayHardware/DisplayMode.h

+8 −7
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


#pragma once



#include "DisplayHardware/Hal.h"

#include "Fps.h"

#include "Scheduler/StrongTyping.h"

#include <cstddef>

#include <memory>

#include <vector>



#include <android-base/stringprintf.h>

#include <android/configuration.h>
@@ -27,9 +27,10 @@ 
#include <ui/Size.h>

#include <utils/Timers.h>



#include <cstddef>

#include <memory>

#include <vector>

#include <scheduler/Fps.h>



#include "DisplayHardware/Hal.h"

#include "Scheduler/StrongTyping.h"



namespace android {

services/surfaceflinger/FrameTimeline/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ cc_library_static { 
    srcs: [

        "FrameTimeline.cpp",

    ],

    header_libs: [

        "libscheduler_headers",

    ],

    shared_libs: [

        "android.hardware.graphics.composer@2.4",

        "libbase",

services/surfaceflinger/FrameTimeline/FrameTimeline.h

+11 −4
Original line number Diff line number Diff line
@@ -16,8 +16,14 @@ 


#pragma once



#include <../Fps.h>

#include <../TimeStats/TimeStats.h>

#include <atomic>

#include <chrono>

#include <deque>

#include <memory>

#include <mutex>

#include <optional>

#include <string>



#include <gui/ISurfaceComposer.h>

#include <gui/JankInfo.h>

#include <perfetto/trace/android/frame_timeline_event.pbzero.h>
@@ -28,8 +34,9 @@ 
#include <utils/Timers.h>

#include <utils/Vector.h>



#include <deque>

#include <mutex>

#include <scheduler/Fps.h>



#include "../TimeStats/TimeStats.h"



namespace android::frametimeline {

services/surfaceflinger/Layer.h

+4 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#pragma once



#include <android/gui/DropInputMode.h>

#include <compositionengine/LayerFE.h>

#include <gui/BufferQueue.h>

#include <gui/ISurfaceComposerClient.h>

#include <gui/LayerState.h>
@@ -39,6 +38,10 @@ 
#include <utils/RefBase.h>

#include <utils/Timers.h>



#include <compositionengine/LayerFE.h>

#include <scheduler/Fps.h>

#include <scheduler/Seamlessness.h>



#include <chrono>

#include <cstdint>

#include <list>
@@ -49,13 +52,11 @@ 
#include "ClientCache.h"

#include "DisplayHardware/ComposerHal.h"

#include "DisplayHardware/HWComposer.h"

#include "Fps.h"

#include "FrameTracker.h"

#include "LayerVector.h"

#include "MonitoredProducer.h"

#include "RenderArea.h"

#include "Scheduler/LayerInfo.h"

#include "Scheduler/Seamlessness.h"

#include "SurfaceFlinger.h"

#include "Tracing/LayerTracing.h"

#include "TransactionCallbackInvoker.h"