Merge "Statically link missing libary to SurfaceFlinger_test" (b52d4c4d) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/layerproto/Android.bp

+16 −3

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

		srcs: [
		@@ -33,7 +33,20 @@ cc_library_shared {
		"-Wno-old-style-cast",
		"-Wno-undef",
		],
		}

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

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

		java_library_static {

+3 −2

Original line number	Diff line number	Diff line
		@@ -46,18 +46,19 @@ cc_test {
		data: ["SurfaceFlinger_test.filter"],
		static_libs: [
		"libtrace_proto",
		"liblayers_proto_static",
		"android.hardware.graphics.composer@2.1",
		],
		shared_libs: [
		"android.hardware.graphics.common-ndk_platform",
		"android.hardware.graphics.common@1.2",
		"android.hardware.graphics.composer@2.1",
		"libandroid",
		"libbase",
		"libbinder",
		"libcutils",
		"libEGL",
		"libGLESv2",
		"libgui",
		"liblayers_proto",
		"liblog",
		"libnativewindow",
		"libprotobuf-cpp-full",