Merge "Statically link missing libraries to libsurfaceflinger_unittest" (351776d4) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/TimeStats/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		cc_library_shared {
		cc_library {
		name: "libtimestats",
		srcs: [
		"TimeStats.cpp",

services/surfaceflinger/TimeStats/timestatsproto/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		cc_library_shared {
		cc_library {
		name: "libtimestats_proto",
		export_include_dirs: ["include"],

services/surfaceflinger/layerproto/Android.bp

+3 −17

Original line number	Diff line number	Diff line
		cc_defaults {
		name: "liblayers_proto_defaults",
		cc_library {
		name: "liblayers_proto",
		export_include_dirs: ["include"],

		srcs: [
		@@ -35,20 +35,6 @@ cc_defaults {
		],
		}

		cc_library_shared {
		name: "liblayers_proto",
		defaults: [
		"liblayers_proto_defaults",
		],
		}

		cc_library_static {
		name: "liblayers_proto_static",
		defaults: [
		"liblayers_proto_defaults",
		],
		}

		java_library_static {
		name: "layersprotosnano",
		host_supported: true,

services/surfaceflinger/tests/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ cc_test {
		data: ["SurfaceFlinger_test.filter"],
		static_libs: [
		"libtrace_proto",
		"liblayers_proto_static",
		"liblayers_proto",
		"android.hardware.graphics.composer@2.1",
		],
		shared_libs: [

services/surfaceflinger/tests/unittests/Android.bp

+48 −5

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@

		cc_test {
		name: "libsurfaceflinger_unittest",
		defaults: ["libsurfaceflinger_defaults"],
		defaults: ["surfaceflinger_defaults"],
		test_suites: ["device-tests"],
		sanitize: {
		// Using the address sanitizer not only helps uncover issues in the code
		@@ -94,22 +94,65 @@ cc_test {
		"mock/system/window/MockNativeWindow.cpp",
		],
		static_libs: [
		"libgmock",
		"libcompositionengine",
		"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.hardware.power@1.0",
		"android.hardware.power@1.1",
		"android.hardware.power@1.2",
		"android.hardware.power@1.3",
		"libcompositionengine_mocks",
		"libcompositionengine",
		"libframetimeline",
		"libgmock",
		"libgui_mocks",
		"liblayers_proto",
		"libperfetto_client_experimental",
		"librenderengine_mocks",
		"librenderengine",
		"libserviceutils",
		"libtimestats",
		"libtimestats_proto",
		"libtrace_proto",
		"perfetto_trace_protos",
		],
		shared_libs: [
		"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.power-cpp",
		"libbase",
		"libbinder",
		"libcutils",
		"libEGL",
		"libfmq",
		"libGLESv1_CM",
		"libGLESv2",
		"libgui",
		"libhidlbase",
		"libinput",
		"liblog",
		"libnativewindow",
		"libprocessgroup",
		"libprotobuf-cpp-lite",
		"libprotoutil",
		"libstatslog",
		"libstatssocket",
		"libtimestats",
		"libtimestats_proto",
		"libSurfaceFlingerProp",
		"libsync",
		"libui",
		"libutils",
		"libstatspull",
		],
		header_libs: [
		"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",
		"libsurfaceflinger_headers",
		],
		}