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

Commit 44f25604 authored by Alec Mouri's avatar Alec Mouri Committed by Android (Google) Code Review
Browse files

Merge "Move FlagManager to a common SF lib" into main

parents 4b93c434 ecbfa077

services/surfaceflinger/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ cc_defaults { 
        "libscheduler",

        "libserviceutils",

        "libshaders",

        "libsurfaceflinger_common",

        "libtimestats",

        "libtonemap",

        "libsurfaceflingerflags",
@@ -175,7 +176,6 @@ filegroup { 
        "FrontEnd/LayerLifecycleManager.cpp",

        "FrontEnd/RequestedLayerState.cpp",

        "FrontEnd/TransactionHandler.cpp",

        "FlagManager.cpp",

        "FpsReporter.cpp",

        "FrameTracer/FrameTracer.cpp",

        "FrameTracker.cpp",

services/surfaceflinger/CompositionEngine/Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -63,7 +63,10 @@ cc_defaults { 
cc_library {

    name: "libcompositionengine",

    defaults: ["libcompositionengine_defaults"],

    static_libs: ["libsurfaceflingerflags"],

    static_libs: [

        "libsurfaceflinger_common",

        "libsurfaceflingerflags",

    ],

    srcs: [

        "src/planner/CachedSet.cpp",

        "src/planner/Flattener.cpp",
@@ -108,6 +111,7 @@ cc_library { 
        "libgtest",

        "libgmock",

        "libcompositionengine",

        "libsurfaceflinger_common_test",

        "libsurfaceflingerflags_test",

    ],

    local_include_dirs: ["include"],
@@ -143,6 +147,7 @@ cc_test { 
        "librenderengine_mocks",

        "libgmock",

        "libgtest",

        "libsurfaceflinger_common_test",

        "libsurfaceflingerflags_test",

    ],

    // For some reason, libvulkan isn't picked up from librenderengine

services/surfaceflinger/DisplayHardware/DisplayMode.h

+1 −1
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ 


#include <scheduler/Fps.h>



#include <common/FlagManager.h>

#include "DisplayHardware/Hal.h"

#include "FlagManager.h"

#include "Scheduler/StrongTyping.h"



namespace android {

services/surfaceflinger/RefreshRateOverlay.cpp

+1 −1
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


#include <algorithm>



#include <common/FlagManager.h>

#include "Client.h"

#include "FlagManager.h"

#include "Layer.h"

#include "RefreshRateOverlay.h"

services/surfaceflinger/Scheduler/EventThread.cpp

+1 −1
Original line number Diff line number Diff line
@@ -43,9 +43,9 @@ 
#include <utils/Errors.h>

#include <utils/Trace.h>



#include <common/FlagManager.h>

#include <scheduler/VsyncConfig.h>

#include "DisplayHardware/DisplayMode.h"

#include "FlagManager.h"

#include "FrameTimeline.h"

#include "VSyncDispatch.h"

#include "VSyncTracker.h"