Merge "Reorder SF Android.bp to make linter happy" into main (9a508dfe) · Commits · e / os / android_frameworks_native

services/surfaceflinger/Android.bp

+28 −28

Original line number	Diff line number	Diff line
		@@ -26,15 +26,15 @@ cc_aconfig_library {
		cc_defaults {
		name: "surfaceflinger_defaults",
		cflags: [
		"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
		"-Wall",
		"-Wconversion",
		"-Werror",
		"-Wextra",
		"-Wformat",
		"-Wthread-safety",
		"-Wunused",
		"-Wunreachable-code",
		"-Wconversion",
		"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
		"-Wunused",
		],
		}

		@@ -43,39 +43,41 @@ cc_defaults {
		defaults: [
		"android.hardware.graphics.composer3-ndk_shared",
		"librenderengine_deps",
		"libtimestats_deps",
		"libsurfaceflinger_common_deps",
		"surfaceflinger_defaults",
		"libsurfaceflinger_proto_deps",
		"libtimestats_deps",
		"poweradvisor_deps",
		"surfaceflinger_defaults",
		],
		cflags: [
		"-DLOG_TAG=\"SurfaceFlinger\"",
		"-DGL_GLEXT_PROTOTYPES",
		"-DEGL_EGLEXT_PROTOTYPES",
		"-DGL_GLEXT_PROTOTYPES",
		"-DLOG_TAG=\"SurfaceFlinger\"",
		],
		shared_libs: [
		"android.hardware.common-V2-ndk",
		"android.hardware.common.fmq-V1-ndk",
		"android.hardware.configstore-utils",
		"android.hardware.configstore@1.0",
		"android.hardware.configstore@1.1",
		"android.hardware.graphics.allocator@2.0",
		"android.hardware.graphics.allocator@3.0",
		"android.hardware.graphics.common@1.2",
		"android.hardware.common-V2-ndk",
		"android.hardware.common.fmq-V1-ndk",
		"android.hardware.graphics.composer@2.1",
		"android.hardware.graphics.composer@2.2",
		"android.hardware.graphics.composer@2.3",
		"android.hardware.graphics.composer@2.4",
		"android.os.flags-aconfig-cc-host",
		"libEGL",
		"libGLESv1_CM",
		"libGLESv2",
		"libSurfaceFlingerProp",
		"libaconfig_storage_read_api_cc",
		"libbase",
		"libbinder",
		"libbinder_ndk",
		"libcutils",
		"libEGL",
		"libfmq",
		"libGLESv1_CM",
		"libGLESv2",
		"libgui",
		"libhidlbase",
		"liblog",
		@@ -86,8 +88,6 @@ cc_defaults {
		"libsync",
		"libui",
		"libutils",
		"libSurfaceFlingerProp",
		"libaconfig_storage_read_api_cc",
		],
		static_libs: [
		"iinputflinger_aidl_lib_static",
		@@ -105,11 +105,11 @@ cc_defaults {
		"libtonemap",
		],
		header_libs: [
		"android.hardware.graphics.composer3-command-buffer",
		"android.hardware.graphics.composer@2.1-command-buffer",
		"android.hardware.graphics.composer@2.2-command-buffer",
		"android.hardware.graphics.composer@2.3-command-buffer",
		"android.hardware.graphics.composer@2.4-command-buffer",
		"android.hardware.graphics.composer3-command-buffer",
		],
		export_static_lib_headers: [
		"libcompositionengine",
		@@ -125,8 +125,8 @@ cc_defaults {
		"android.hardware.graphics.composer@2.2",
		"android.hardware.graphics.composer@2.3",
		"android.hardware.graphics.composer@2.4",
		"libpowermanager",
		"libhidlbase",
		"libpowermanager",
		],
		// TODO (marissaw): this library is not used by surfaceflinger. This is here so
		// the library compiled in a way that is accessible to system partition when running
		@@ -177,7 +177,6 @@ cc_library_headers {
		filegroup {
		name: "libsurfaceflinger_backend_sources",
		srcs: [
		"PowerAdvisor/*.cpp",
		"DisplayHardware/AidlComposerHal.cpp",
		"DisplayHardware/ComposerHal.cpp",
		"DisplayHardware/FramebufferSurface.cpp",
		@@ -185,6 +184,7 @@ filegroup {
		"DisplayHardware/HWComposer.cpp",
		"DisplayHardware/HidlComposerHal.cpp",
		"DisplayHardware/VirtualDisplaySurface.cpp",
		"PowerAdvisor/*.cpp",
		],
		}

		@@ -208,21 +208,20 @@ filegroup {
		"DisplayDevice.cpp",
		"DisplayRenderArea.cpp",
		"Effects/Daltonizer.cpp",
		"FpsReporter.cpp",
		"FrameTracer/FrameTracer.cpp",
		"FrameTracker.cpp",
		"FrontEnd/LayerCreationArgs.cpp",
		"FrontEnd/LayerHandle.cpp",
		"FrontEnd/LayerSnapshot.cpp",
		"FrontEnd/LayerSnapshotBuilder.cpp",
		"FrontEnd/LayerHierarchy.cpp",
		"FrontEnd/LayerLifecycleManager.cpp",
		"FrontEnd/LayerSnapshot.cpp",
		"FrontEnd/LayerSnapshotBuilder.cpp",
		"FrontEnd/RequestedLayerState.cpp",
		"FrontEnd/TransactionHandler.cpp",
		"FpsReporter.cpp",
		"FrameTracer/FrameTracer.cpp",
		"FrameTracker.cpp",
		"HdrLayerInfoReporter.cpp",
		"HdrSdrRatioOverlay.cpp",
		"Jank/JankTracker.cpp",
		"WindowInfosListenerInvoker.cpp",
		"Layer.cpp",
		"LayerFE.cpp",
		"LayerProtoHelper.cpp",
		@@ -234,10 +233,10 @@ filegroup {
		"RenderArea.cpp",
		"Scheduler/EventThread.cpp",
		"Scheduler/FrameRateOverrideMappings.cpp",
		"Scheduler/OneShotTimer.cpp",
		"Scheduler/LayerHistory.cpp",
		"Scheduler/LayerInfo.cpp",
		"Scheduler/MessageQueue.cpp",
		"Scheduler/OneShotTimer.cpp",
		"Scheduler/RefreshRateSelector.cpp",
		"Scheduler/Scheduler.cpp",
		"Scheduler/SmallAreaDetectionAllowMappings.cpp",
		@@ -253,19 +252,20 @@ filegroup {
		"Tracing/LayerDataSource.cpp",
		"Tracing/LayerTracing.cpp",
		"Tracing/TransactionDataSource.cpp",
		"Tracing/TransactionTracing.cpp",
		"Tracing/TransactionProtoParser.cpp",
		"Tracing/TransactionTracing.cpp",
		"Tracing/tools/LayerTraceGenerator.cpp",
		"TransactionCallbackInvoker.cpp",
		"TunnelModeEnabledReporter.cpp",
		"WindowInfosListenerInvoker.cpp",
		],
		}

		cc_defaults {
		name: "libsurfaceflinger_binary",
		defaults: [
		"surfaceflinger_defaults",
		"libsurfaceflinger_production_defaults",
		"surfaceflinger_defaults",
		],
		cflags: [
		"-DLOG_TAG=\"SurfaceFlinger\"",
		@@ -331,9 +331,9 @@ cc_library_shared {
		"android.hardware.configstore@1.1",
		"android.hardware.graphics.common@1.2",
		"libhidlbase",
		"liblog",
		"libui",
		"libutils",
		"liblog",
		],
		static_libs: [
		"libSurfaceFlingerProperties",
		@@ -354,10 +354,10 @@ cc_library {
		generated_headers: ["statslog_surfaceflinger.h"],
		export_generated_headers: ["statslog_surfaceflinger.h"],
		shared_libs: [
		"android.os.statsbootstrap_aidl-cpp",
		"libbinder",
		"libstatsbootstrap",
		"libutils",
		"android.os.statsbootstrap_aidl-cpp",
		],
		}