Merge "gpuservice: move some libs from shared to static" into main (667e31ac) · Commits · e / devices / smdk4412 / android_frameworks_native

services/gpuservice/Android.bp

+17 −8

Original line number	Diff line number	Diff line
		@@ -21,7 +21,13 @@ cc_defaults {

		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 @@ cc_defaults {
		"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 @@ filegroup {
		],
		}

		cc_library_shared {
		cc_library_static {
		name: "libgpuservice",
		defaults: ["libgpuservice_production_defaults"],
		export_include_dirs: ["include"],
		@@ -96,14 +102,17 @@ filegroup {

		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",
		],
		}

+13 −6

Original line number	Diff line number	Diff line
		@@ -21,12 +21,8 @@ package {
		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 @@ cc_library_shared {
		"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"],

+12 −5

Original line number	Diff line number	Diff line
		@@ -7,11 +7,8 @@ package {
		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 @@ cc_library_shared {
		"libstatssocket",
		"libutils",
		],
		}

		cc_library_static {
		name: "libgfxstats",
		defaults: [
		"libgfxstats_deps",
		],
		srcs: [
		"GpuStats.cpp",
		],
		export_include_dirs: ["include"],
		export_shared_lib_headers: [
		"libstatspull",

+2 −3

Original line number	Diff line number	Diff line
		@@ -5,10 +5,12 @@ package {
		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 @@ cc_fuzz {
		},
		include_dirs: ["frameworks/native/services/gpuservice/"],
		srcs: ["GpuServiceFuzzer.cpp"],
		shared_libs: [
		"libgpuservice",
		],
		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -24,6 +24,9 @@ package {
		cc_test {
		name: "gpuservice_unittest",
		test_suites: ["device-tests"],
		defaults: [
		"libgpuservice_defaults",
		],
		srcs: [
		"GpuMemTest.cpp",
		"GpuMemTracerTest.cpp",
		@@ -36,9 +39,6 @@ cc_test {
		"libbinder",
		"libbpf_bcc",
		"libcutils",
		"libgfxstats",
		"libgpumem",
		"libgpumemtracer",
		"libgraphicsenv",
		"liblog",
		"libprotobuf-cpp-lite",
		@@ -46,10 +46,10 @@ cc_test {
		"libstatslog",
		"libstatspull",
		"libutils",
		"libgpuservice",
		],
		static_libs: [
		"libgmock",
		"libgpuservice",
		"libperfetto_client_experimental",
		"perfetto_trace_protos",
		],