Revert^2 "Move FlagManager to a common SF lib" (9b133ca9) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -93,6 +93,7 @@ cc_defaults {
	"libscheduler",		"libscheduler",
	"libserviceutils",		"libserviceutils",
	"libshaders",		"libshaders",
			"libsurfaceflinger_common",
	"libtimestats",		"libtimestats",
	"libtonemap",		"libtonemap",
	"libsurfaceflingerflags",		"libsurfaceflingerflags",
	@@ -175,7 +176,6 @@ filegroup {
	"FrontEnd/LayerLifecycleManager.cpp",		"FrontEnd/LayerLifecycleManager.cpp",
	"FrontEnd/RequestedLayerState.cpp",		"FrontEnd/RequestedLayerState.cpp",
	"FrontEnd/TransactionHandler.cpp",		"FrontEnd/TransactionHandler.cpp",
	"FlagManager.cpp",
	"FpsReporter.cpp",		"FpsReporter.cpp",
	"FrameTracer/FrameTracer.cpp",		"FrameTracer/FrameTracer.cpp",
	"FrameTracker.cpp",		"FrameTracker.cpp",

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -63,7 +63,10 @@ cc_defaults {
	cc_library {		cc_library {
	name: "libcompositionengine",		name: "libcompositionengine",
	defaults: ["libcompositionengine_defaults"],		defaults: ["libcompositionengine_defaults"],
	static_libs: ["libsurfaceflingerflags"],		static_libs: [
			"libsurfaceflinger_common",
			"libsurfaceflingerflags",
			],
	srcs: [		srcs: [
	"src/planner/CachedSet.cpp",		"src/planner/CachedSet.cpp",
	"src/planner/Flattener.cpp",		"src/planner/Flattener.cpp",
	@@ -108,6 +111,7 @@ cc_library {
	"libgtest",		"libgtest",
	"libgmock",		"libgmock",
	"libcompositionengine",		"libcompositionengine",
			"libsurfaceflinger_common_test",
	"libsurfaceflingerflags_test",		"libsurfaceflingerflags_test",
	],		],
	local_include_dirs: ["include"],		local_include_dirs: ["include"],
	@@ -143,6 +147,7 @@ cc_test {
	"librenderengine_mocks",		"librenderengine_mocks",
	"libgmock",		"libgmock",
	"libgtest",		"libgtest",
			"libsurfaceflinger_common_test",
	"libsurfaceflingerflags_test",		"libsurfaceflingerflags_test",
	],		],
	// For some reason, libvulkan isn't picked up from librenderengine		// For some reason, libvulkan isn't picked up from librenderengine

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,12 +19,12 @@
	#define ATRACE_TAG ATRACE_TAG_GRAPHICS		#define ATRACE_TAG ATRACE_TAG_GRAPHICS

	#include "AidlComposerHal.h"		#include "AidlComposerHal.h"
	#include "FlagManager.h"

	#include <SurfaceFlingerProperties.h>		#include <SurfaceFlingerProperties.h>
	#include <android-base/file.h>		#include <android-base/file.h>
	#include <android/binder_ibinder_platform.h>		#include <android/binder_ibinder_platform.h>
	#include <android/binder_manager.h>		#include <android/binder_manager.h>
			#include <common/FlagManager.h>
	#include <gui/TraceUtils.h>		#include <gui/TraceUtils.h>
	#include <log/log.h>		#include <log/log.h>
	#include <utils/Trace.h>		#include <utils/Trace.h>

+1 −1

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

	#include <scheduler/Fps.h>		#include <scheduler/Fps.h>

			#include <common/FlagManager.h>
	#include "DisplayHardware/Hal.h"		#include "DisplayHardware/Hal.h"
	#include "FlagManager.h"
	#include "Scheduler/StrongTyping.h"		#include "Scheduler/StrongTyping.h"

	namespace android {		namespace android {

+1 −1

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

	#include <algorithm>		#include <algorithm>

			#include <common/FlagManager.h>
	#include "Client.h"		#include "Client.h"
	#include "FlagManager.h"
	#include "Layer.h"		#include "Layer.h"
	#include "RefreshRateOverlay.h"		#include "RefreshRateOverlay.h"