gpuservice: move some libs from shared to static
These libraries are only used by this process on a device and gain no
benifit from being included as shared libraries.
Moving them to static saves disk space, memory, and cpu cycles from the
dynamic linker.
With 3 reboots before and after I'm seeing average savings of 230KB of
storage space from installed files, 44KB private dirty memory,
176KB PSS from libraries/binary only, and 160KB PSS from everything in showmap.
go/shared-to-static for more info on how this was determined.
Test: m
Bug: 280829178
Change-Id: I798171dafac3344b6b49123014e73c98c10c26ad
diff --git a/services/gpuservice/Android.bp b/services/gpuservice/Android.bp
index 052efb6b..e5b1e44 100644
--- a/services/gpuservice/Android.bp
+++ b/services/gpuservice/Android.bp
@@ -21,7 +21,13 @@
cc_defaults {
name: "libgpuservice_defaults",
- defaults: ["gpuservice_defaults"],
+ defaults: [
+ "gpuservice_defaults",
+ "libvkjson_deps",
+ "libgfxstats_deps",
+ "libgpumem_deps",
+ "libgpumemtracer_deps",
+ ],
cflags: [
"-DLOG_TAG=\"GpuService\"",
],
@@ -29,17 +35,17 @@
"libbase",
"libbinder",
"libcutils",
- "libgfxstats",
- "libgpumem",
"libgpuwork",
- "libgpumemtracer",
"libgraphicsenv",
"liblog",
"libutils",
- "libvkjson",
],
static_libs: [
+ "libgfxstats",
+ "libgpumem",
+ "libgpumemtracer",
"libserviceutils",
+ "libvkjson",
],
export_static_lib_headers: [
"libserviceutils",
@@ -68,7 +74,7 @@
],
}
-cc_library_shared {
+cc_library_static {
name: "libgpuservice",
defaults: ["libgpuservice_production_defaults"],
export_include_dirs: ["include"],
@@ -96,14 +102,17 @@
cc_binary {
name: "gpuservice",
- defaults: ["libgpuservice_binary"],
+ defaults: [
+ "libgpuservice_binary",
+ "libgpuservice_production_defaults",
+ ],
init_rc: ["gpuservice.rc"],
required: [
"bpfloader",
"gpuMem.o",
],
srcs: [":gpuservice_binary_sources"],
- shared_libs: [
+ static_libs: [
"libgpuservice",
],
}
diff --git a/services/gpuservice/gpumem/Android.bp b/services/gpuservice/gpumem/Android.bp
index d0ea856..66a3059 100644
--- a/services/gpuservice/gpumem/Android.bp
+++ b/services/gpuservice/gpumem/Android.bp
@@ -21,12 +21,8 @@
default_applicable_licenses: ["frameworks_native_license"],
}
-cc_library_shared {
- name: "libgpumem",
- srcs: [
- "GpuMem.cpp",
- ],
- header_libs: ["bpf_headers"],
+cc_defaults {
+ name: "libgpumem_deps",
shared_libs: [
"libbase",
"libbpf_bcc",
@@ -34,6 +30,17 @@
"liblog",
"libutils",
],
+}
+
+cc_library_static {
+ name: "libgpumem",
+ defaults: [
+ "libgpumem_deps",
+ ],
+ srcs: [
+ "GpuMem.cpp",
+ ],
+ header_libs: ["bpf_headers"],
export_include_dirs: ["include"],
export_header_lib_headers: ["bpf_headers"],
export_shared_lib_headers: ["libbase"],
diff --git a/services/gpuservice/gpustats/Android.bp b/services/gpuservice/gpustats/Android.bp
index 54291ad..0e64716 100644
--- a/services/gpuservice/gpustats/Android.bp
+++ b/services/gpuservice/gpustats/Android.bp
@@ -7,11 +7,8 @@
default_applicable_licenses: ["frameworks_native_license"],
}
-cc_library_shared {
- name: "libgfxstats",
- srcs: [
- "GpuStats.cpp",
- ],
+cc_defaults {
+ name: "libgfxstats_deps",
shared_libs: [
"libcutils",
"libgraphicsenv",
@@ -22,6 +19,16 @@
"libstatssocket",
"libutils",
],
+}
+
+cc_library_static {
+ name: "libgfxstats",
+ defaults: [
+ "libgfxstats_deps",
+ ],
+ srcs: [
+ "GpuStats.cpp",
+ ],
export_include_dirs: ["include"],
export_shared_lib_headers: [
"libstatspull",
diff --git a/services/gpuservice/tests/fuzzers/Android.bp b/services/gpuservice/tests/fuzzers/Android.bp
index 6bcc5e8..d4d48c4 100644
--- a/services/gpuservice/tests/fuzzers/Android.bp
+++ b/services/gpuservice/tests/fuzzers/Android.bp
@@ -5,10 +5,12 @@
cc_fuzz {
name: "gpu_service_fuzzer",
defaults: [
+ "libgpuservice_defaults",
"service_fuzzer_defaults",
"fuzzer_disable_leaks",
],
static_libs: [
+ "libgpuservice",
"liblog",
],
fuzz_config: {
@@ -20,7 +22,4 @@
},
include_dirs: ["frameworks/native/services/gpuservice/"],
srcs: ["GpuServiceFuzzer.cpp"],
- shared_libs: [
- "libgpuservice",
- ],
}
diff --git a/services/gpuservice/tests/unittests/Android.bp b/services/gpuservice/tests/unittests/Android.bp
index c870b17..8056a2c 100644
--- a/services/gpuservice/tests/unittests/Android.bp
+++ b/services/gpuservice/tests/unittests/Android.bp
@@ -24,6 +24,9 @@
cc_test {
name: "gpuservice_unittest",
test_suites: ["device-tests"],
+ defaults: [
+ "libgpuservice_defaults",
+ ],
srcs: [
"GpuMemTest.cpp",
"GpuMemTracerTest.cpp",
@@ -36,9 +39,6 @@
"libbinder",
"libbpf_bcc",
"libcutils",
- "libgfxstats",
- "libgpumem",
- "libgpumemtracer",
"libgraphicsenv",
"liblog",
"libprotobuf-cpp-lite",
@@ -46,10 +46,10 @@
"libstatslog",
"libstatspull",
"libutils",
- "libgpuservice",
],
static_libs: [
"libgmock",
+ "libgpuservice",
"libperfetto_client_experimental",
"perfetto_trace_protos",
],
diff --git a/services/gpuservice/tracing/Android.bp b/services/gpuservice/tracing/Android.bp
index a1bc1ed..d636b7d 100644
--- a/services/gpuservice/tracing/Android.bp
+++ b/services/gpuservice/tracing/Android.bp
@@ -21,20 +21,28 @@
default_applicable_licenses: ["frameworks_native_license"],
}
-cc_library_shared {
- name: "libgpumemtracer",
- srcs: [
- "GpuMemTracer.cpp",
- ],
+cc_defaults {
+ name: "libgpumemtracer_deps",
shared_libs: [
- "libgpumem",
"libbase",
"liblog",
"libutils",
],
static_libs: [
+ "libgpumem",
"libperfetto_client_experimental",
],
+}
+
+cc_library_static {
+ name: "libgpumemtracer",
+ defaults: [
+ "libgpumemtracer_deps",
+ "libgpumem_deps",
+ ],
+ srcs: [
+ "GpuMemTracer.cpp",
+ ],
export_include_dirs: ["include"],
export_static_lib_headers: [
"libperfetto_client_experimental",
diff --git a/vulkan/vkjson/Android.bp b/vulkan/vkjson/Android.bp
index b544245..de4271d 100644
--- a/vulkan/vkjson/Android.bp
+++ b/vulkan/vkjson/Android.bp
@@ -7,8 +7,19 @@
default_applicable_licenses: ["frameworks_native_license"],
}
-cc_library_shared {
+cc_defaults {
+ name: "libvkjson_deps",
+ shared_libs: [
+ "libjsoncpp",
+ "libvulkan",
+ ],
+}
+
+cc_library_static {
name: "libvkjson",
+ defaults: [
+ "libvkjson_deps",
+ ],
srcs: [
"vkjson.cc",
"vkjson_instance.cc",
@@ -24,10 +35,6 @@
export_include_dirs: [
".",
],
- shared_libs: [
- "libjsoncpp",
- "libvulkan",
- ],
export_shared_lib_headers: [
"libvulkan",
],