Skip to content

Commit b76cb21

Browse files
author
Melody Hsu
committed
Reorder SF Android.bp to make linter happy
Bug: b/377758217 Test: presubmit Flag: EXEMPT, refactor Change-Id: Ia5ebb451f4feacbefc28aaa62d9b6c22c34f7dc1
1 parent a1635a6 commit b76cb21

1 file changed

Lines changed: 28 additions & 28 deletions

File tree

‎services/surfaceflinger/Android.bp‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ cc_aconfig_library {
2626
cc_defaults {
2727
name: "surfaceflinger_defaults",
2828
cflags: [
29+
"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
2930
"-Wall",
31+
"-Wconversion",
3032
"-Werror",
3133
"-Wextra",
3234
"-Wformat",
3335
"-Wthread-safety",
34-
"-Wunused",
3536
"-Wunreachable-code",
36-
"-Wconversion",
37-
"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
37+
"-Wunused",
3838
],
3939
}
4040

@@ -43,39 +43,41 @@ cc_defaults {
4343
defaults: [
4444
"android.hardware.graphics.composer3-ndk_shared",
4545
"librenderengine_deps",
46-
"libtimestats_deps",
4746
"libsurfaceflinger_common_deps",
48-
"surfaceflinger_defaults",
4947
"libsurfaceflinger_proto_deps",
48+
"libtimestats_deps",
5049
"poweradvisor_deps",
50+
"surfaceflinger_defaults",
5151
],
5252
cflags: [
53-
"-DLOG_TAG=\"SurfaceFlinger\"",
54-
"-DGL_GLEXT_PROTOTYPES",
5553
"-DEGL_EGLEXT_PROTOTYPES",
54+
"-DGL_GLEXT_PROTOTYPES",
55+
"-DLOG_TAG=\"SurfaceFlinger\"",
5656
],
5757
shared_libs: [
58+
"android.hardware.common-V2-ndk",
59+
"android.hardware.common.fmq-V1-ndk",
5860
"android.hardware.configstore-utils",
5961
"android.hardware.configstore@1.0",
6062
"android.hardware.configstore@1.1",
6163
"android.hardware.graphics.allocator@2.0",
6264
"android.hardware.graphics.allocator@3.0",
6365
"android.hardware.graphics.common@1.2",
64-
"android.hardware.common-V2-ndk",
65-
"android.hardware.common.fmq-V1-ndk",
6666
"android.hardware.graphics.composer@2.1",
6767
"android.hardware.graphics.composer@2.2",
6868
"android.hardware.graphics.composer@2.3",
6969
"android.hardware.graphics.composer@2.4",
7070
"android.os.flags-aconfig-cc-host",
71+
"libEGL",
72+
"libGLESv1_CM",
73+
"libGLESv2",
74+
"libSurfaceFlingerProp",
75+
"libaconfig_storage_read_api_cc",
7176
"libbase",
7277
"libbinder",
7378
"libbinder_ndk",
7479
"libcutils",
75-
"libEGL",
7680
"libfmq",
77-
"libGLESv1_CM",
78-
"libGLESv2",
7981
"libgui",
8082
"libhidlbase",
8183
"liblog",
@@ -86,8 +88,6 @@ cc_defaults {
8688
"libsync",
8789
"libui",
8890
"libutils",
89-
"libSurfaceFlingerProp",
90-
"libaconfig_storage_read_api_cc",
9191
],
9292
static_libs: [
9393
"iinputflinger_aidl_lib_static",
@@ -105,11 +105,11 @@ cc_defaults {
105105
"libtonemap",
106106
],
107107
header_libs: [
108+
"android.hardware.graphics.composer3-command-buffer",
108109
"android.hardware.graphics.composer@2.1-command-buffer",
109110
"android.hardware.graphics.composer@2.2-command-buffer",
110111
"android.hardware.graphics.composer@2.3-command-buffer",
111112
"android.hardware.graphics.composer@2.4-command-buffer",
112-
"android.hardware.graphics.composer3-command-buffer",
113113
],
114114
export_static_lib_headers: [
115115
"libcompositionengine",
@@ -125,8 +125,8 @@ cc_defaults {
125125
"android.hardware.graphics.composer@2.2",
126126
"android.hardware.graphics.composer@2.3",
127127
"android.hardware.graphics.composer@2.4",
128-
"libpowermanager",
129128
"libhidlbase",
129+
"libpowermanager",
130130
],
131131
// TODO (marissaw): this library is not used by surfaceflinger. This is here so
132132
// the library compiled in a way that is accessible to system partition when running
@@ -177,14 +177,14 @@ cc_library_headers {
177177
filegroup {
178178
name: "libsurfaceflinger_backend_sources",
179179
srcs: [
180-
"PowerAdvisor/*.cpp",
181180
"DisplayHardware/AidlComposerHal.cpp",
182181
"DisplayHardware/ComposerHal.cpp",
183182
"DisplayHardware/FramebufferSurface.cpp",
184183
"DisplayHardware/HWC2.cpp",
185184
"DisplayHardware/HWComposer.cpp",
186185
"DisplayHardware/HidlComposerHal.cpp",
187186
"DisplayHardware/VirtualDisplaySurface.cpp",
187+
"PowerAdvisor/*.cpp",
188188
],
189189
}
190190

@@ -208,21 +208,20 @@ filegroup {
208208
"DisplayDevice.cpp",
209209
"DisplayRenderArea.cpp",
210210
"Effects/Daltonizer.cpp",
211+
"FpsReporter.cpp",
212+
"FrameTracer/FrameTracer.cpp",
213+
"FrameTracker.cpp",
211214
"FrontEnd/LayerCreationArgs.cpp",
212215
"FrontEnd/LayerHandle.cpp",
213-
"FrontEnd/LayerSnapshot.cpp",
214-
"FrontEnd/LayerSnapshotBuilder.cpp",
215216
"FrontEnd/LayerHierarchy.cpp",
216217
"FrontEnd/LayerLifecycleManager.cpp",
218+
"FrontEnd/LayerSnapshot.cpp",
219+
"FrontEnd/LayerSnapshotBuilder.cpp",
217220
"FrontEnd/RequestedLayerState.cpp",
218221
"FrontEnd/TransactionHandler.cpp",
219-
"FpsReporter.cpp",
220-
"FrameTracer/FrameTracer.cpp",
221-
"FrameTracker.cpp",
222222
"HdrLayerInfoReporter.cpp",
223223
"HdrSdrRatioOverlay.cpp",
224224
"Jank/JankTracker.cpp",
225-
"WindowInfosListenerInvoker.cpp",
226225
"Layer.cpp",
227226
"LayerFE.cpp",
228227
"LayerProtoHelper.cpp",
@@ -234,10 +233,10 @@ filegroup {
234233
"RenderArea.cpp",
235234
"Scheduler/EventThread.cpp",
236235
"Scheduler/FrameRateOverrideMappings.cpp",
237-
"Scheduler/OneShotTimer.cpp",
238236
"Scheduler/LayerHistory.cpp",
239237
"Scheduler/LayerInfo.cpp",
240238
"Scheduler/MessageQueue.cpp",
239+
"Scheduler/OneShotTimer.cpp",
241240
"Scheduler/RefreshRateSelector.cpp",
242241
"Scheduler/Scheduler.cpp",
243242
"Scheduler/SmallAreaDetectionAllowMappings.cpp",
@@ -253,19 +252,20 @@ filegroup {
253252
"Tracing/LayerDataSource.cpp",
254253
"Tracing/LayerTracing.cpp",
255254
"Tracing/TransactionDataSource.cpp",
256-
"Tracing/TransactionTracing.cpp",
257255
"Tracing/TransactionProtoParser.cpp",
256+
"Tracing/TransactionTracing.cpp",
258257
"Tracing/tools/LayerTraceGenerator.cpp",
259258
"TransactionCallbackInvoker.cpp",
260259
"TunnelModeEnabledReporter.cpp",
260+
"WindowInfosListenerInvoker.cpp",
261261
],
262262
}
263263

264264
cc_defaults {
265265
name: "libsurfaceflinger_binary",
266266
defaults: [
267-
"surfaceflinger_defaults",
268267
"libsurfaceflinger_production_defaults",
268+
"surfaceflinger_defaults",
269269
],
270270
cflags: [
271271
"-DLOG_TAG=\"SurfaceFlinger\"",
@@ -331,9 +331,9 @@ cc_library_shared {
331331
"android.hardware.configstore@1.1",
332332
"android.hardware.graphics.common@1.2",
333333
"libhidlbase",
334+
"liblog",
334335
"libui",
335336
"libutils",
336-
"liblog",
337337
],
338338
static_libs: [
339339
"libSurfaceFlingerProperties",
@@ -354,10 +354,10 @@ cc_library {
354354
generated_headers: ["statslog_surfaceflinger.h"],
355355
export_generated_headers: ["statslog_surfaceflinger.h"],
356356
shared_libs: [
357+
"android.os.statsbootstrap_aidl-cpp",
357358
"libbinder",
358359
"libstatsbootstrap",
359360
"libutils",
360-
"android.os.statsbootstrap_aidl-cpp",
361361
],
362362
}
363363

0 commit comments

Comments
 (0)