Merge "Revert "Move FlagManager to a common SF lib"" into main (e87239dd) · Commits · e / os / platform_frameworks_native

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",

+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

+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 {

+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>

+0 −0

File moved.