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

Commit 27a51323 authored by Fyodor Kyslov's avatar Fyodor Kyslov Committed by Android (Google) Code Review
Browse files

Revert "Move FlagManager to a common SF lib" 

Revert submission 25261159-flagmanager_common

Reason for revert: build breakage: b/310935941

Reverted changes: /q/submissionid:25261159-flagmanager_common

Change-Id: I44795b34c4ef97b78c080d6421eb61a454675ddb
parent ecbfa077

services/surfaceflinger/Android.bp

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

        "libserviceutils",

        "libshaders",

        "libsurfaceflinger_common",

        "libtimestats",

        "libtonemap",

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

        "FrontEnd/RequestedLayerState.cpp",

        "FrontEnd/TransactionHandler.cpp",

        "FlagManager.cpp",

        "FpsReporter.cpp",

        "FrameTracer/FrameTracer.cpp",

        "FrameTracker.cpp",

services/surfaceflinger/CompositionEngine/Android.bp

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

    name: "libcompositionengine",

    defaults: ["libcompositionengine_defaults"],

    static_libs: [

        "libsurfaceflinger_common",

        "libsurfaceflingerflags",

    ],

    static_libs: ["libsurfaceflingerflags"],

    srcs: [

        "src/planner/CachedSet.cpp",

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

        "libgmock",

        "libcompositionengine",

        "libsurfaceflinger_common_test",

        "libsurfaceflingerflags_test",

    ],

    local_include_dirs: ["include"],
@@ -147,7 +143,6 @@ 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/common/FlagManager.cpp→services/surfaceflinger/FlagManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include <common/FlagManager.h>

#include "FlagManager.h"



#include <SurfaceFlingerProperties.sysprop.h>

#include <android-base/parsebool.h>