diff options
| -rw-r--r-- | services/displayservice/Android.bp | 12 | ||||
| -rw-r--r-- | services/surfaceflinger/Android.bp | 11 | ||||
| -rw-r--r-- | services/surfaceflinger/CompositionEngine/Android.bp | 5 | ||||
| -rw-r--r-- | services/surfaceflinger/TimeStats/Android.bp | 36 |
4 files changed, 42 insertions, 22 deletions
diff --git a/services/displayservice/Android.bp b/services/displayservice/Android.bp index 8681784405..c88f2fca83 100644 --- a/services/displayservice/Android.bp +++ b/services/displayservice/Android.bp @@ -23,7 +23,7 @@ package { default_applicable_licenses: ["frameworks_native_license"], } -cc_library_shared { +cc_library_static { name: "libdisplayservicehidl", srcs: [ @@ -37,18 +37,24 @@ cc_library_shared { "libgui", "libhidlbase", "libutils", + ], + + static_libs: [ "android.frameworks.displayservice@1.0", ], export_include_dirs: ["include"], export_shared_lib_headers: [ - "android.frameworks.displayservice@1.0", "libgui", "libutils", ], + export_static_lib_headers: [ + "android.frameworks.displayservice@1.0", + ], + cflags: [ "-Werror", "-Wall", - ] + ], } diff --git a/services/surfaceflinger/Android.bp b/services/surfaceflinger/Android.bp index 5683a9280f..b355221f4b 100644 --- a/services/surfaceflinger/Android.bp +++ b/services/surfaceflinger/Android.bp @@ -27,6 +27,7 @@ cc_defaults { defaults: [ "android.hardware.graphics.composer3-ndk_shared", "librenderengine_deps", + "libtimestats_deps", "surfaceflinger_defaults", ], cflags: [ @@ -58,14 +59,12 @@ cc_defaults { "libGLESv2", "libgui", "libhidlbase", - "liblayers_proto", "liblog", "libnativewindow", "libpowermanager", "libprocessgroup", "libprotobuf-cpp-lite", "libsync", - "libtimestats", "libui", "libinput", "libutils", @@ -77,11 +76,13 @@ cc_defaults { "libcompositionengine", "libframetimeline", "libgui_aidl_static", + "liblayers_proto", "libperfetto_client_experimental", "librenderengine", "libscheduler", "libserviceutils", "libshaders", + "libtimestats", "libtonemap", ], header_libs: [ @@ -95,6 +96,7 @@ cc_defaults { "libcompositionengine", "librenderengine", "libserviceutils", + "libtimestats", ], export_shared_lib_headers: [ "android.hardware.graphics.allocator@2.0", @@ -106,7 +108,6 @@ cc_defaults { "android.hardware.graphics.composer@2.4", "libpowermanager", "libhidlbase", - "libtimestats", ], // 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 @@ -213,14 +214,12 @@ cc_defaults { "-DLOG_TAG=\"SurfaceFlinger\"", ], shared_libs: [ - "android.frameworks.displayservice@1.0", "android.hardware.configstore-utils", "android.hardware.configstore@1.0", "android.hardware.graphics.allocator@2.0", "android.hardware.graphics.allocator@3.0", "libbinder", "libcutils", - "libdisplayservicehidl", "libhidlbase", "liblog", "libprocessgroup", @@ -228,6 +227,8 @@ cc_defaults { "libutils", ], static_libs: [ + "android.frameworks.displayservice@1.0", + "libdisplayservicehidl", "libserviceutils", ], } diff --git a/services/surfaceflinger/CompositionEngine/Android.bp b/services/surfaceflinger/CompositionEngine/Android.bp index f3a0186e3e..702bd332b6 100644 --- a/services/surfaceflinger/CompositionEngine/Android.bp +++ b/services/surfaceflinger/CompositionEngine/Android.bp @@ -12,6 +12,7 @@ cc_defaults { defaults: [ "android.hardware.graphics.composer3-ndk_shared", "librenderengine_deps", + "libtimestats_deps", "surfaceflinger_defaults", ], cflags: [ @@ -30,18 +31,18 @@ cc_defaults { "libbase", "libcutils", "libgui", - "liblayers_proto", "liblog", "libnativewindow", "libprotobuf-cpp-lite", "libSurfaceFlingerProp", - "libtimestats", "libui", "libutils", ], static_libs: [ + "liblayers_proto", "libmath", "librenderengine", + "libtimestats", "libtonemap", "libaidlcommonsupport", "libprocessgroup", diff --git a/services/surfaceflinger/TimeStats/Android.bp b/services/surfaceflinger/TimeStats/Android.bp index 4686eed54c..c3141be9db 100644 --- a/services/surfaceflinger/TimeStats/Android.bp +++ b/services/surfaceflinger/TimeStats/Android.bp @@ -7,14 +7,9 @@ package { default_applicable_licenses: ["frameworks_native_license"], } -cc_library { - name: "libtimestats", - srcs: [ - "TimeStats.cpp", - ], - header_libs: [ - "libscheduler_headers", - ], +cc_defaults { + name: "libtimestats_deps", + shared_libs: [ "android.hardware.graphics.composer@2.4", "libbase", @@ -22,17 +17,34 @@ cc_library { "liblog", "libprotobuf-cpp-lite", "libtimestats_atoms_proto", - "libtimestats_proto", "libui", "libutils", ], + + static_libs: [ + "libtimestats_proto", + ], + + export_static_lib_headers: [ + "libtimestats_proto", + ], +} + +cc_library { + name: "libtimestats", + defaults: [ + "libtimestats_deps", + ], + srcs: [ + "TimeStats.cpp", + ], + header_libs: [ + "libscheduler_headers", + ], export_include_dirs: ["."], export_header_lib_headers: [ "libscheduler_headers", ], - export_shared_lib_headers: [ - "libtimestats_proto", - ], cppflags: [ "-Wall", "-Werror", |