commit 27a51323615008f4ec2b87e8f066591b5041516a
author Fyodor Kyslov <kyslov@google.com> Tue Nov 14 16:30:14 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 14 16:30:17 2023 +0000
tree 4391459f988a9dfd9b093a4f72b26329d02a0a32
parent ecbfa07774714ed49884f8424e5d9a92826a8f9c

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

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 7333bc3..9c8555e 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -113,7 +113,6 @@
 #include <unordered_map>
 #include <vector>
 
-#include <common/FlagManager.h>
 #include <gui/LayerStatePermissions.h>
 #include <gui/SchedulingPolicy.h>
 #include <ui/DisplayIdentification.h>
@@ -130,6 +129,7 @@
 #include "DisplayHardware/VirtualDisplaySurface.h"
 #include "DisplayRenderArea.h"
 #include "Effects/Daltonizer.h"
+#include "FlagManager.h"
 #include "FpsReporter.h"
 #include "FrameTimeline/FrameTimeline.h"
 #include "FrameTracer/FrameTracer.h"