Merge "Make swcodec service link to no-binder version of bufferqueue" into... (ac69b535) · Commits · e / os / android_frameworks_av

media/codec2/hidl/1.0/utils/Android.bp

+12 −1

Original line number	Original line	Diff line number	Diff line
	@@ -83,11 +83,22 @@ cc_library {
	"libhidlbase",		"libhidlbase",
	"liblog",		"liblog",
	"libstagefright_bufferpool@2.0.1",		"libstagefright_bufferpool@2.0.1",
	"libstagefright_bufferqueue_helper",		"libstagefright_bufferqueue_helper_novndk",
	"libui",		"libui",
	"libutils",		"libutils",
	],		],

			target: {
			vendor: {
			exclude_shared_libs: [
			"libstagefright_bufferqueue_helper_novndk",
			],
			shared_libs: [
			"libstagefright_bufferqueue_helper",
			],
			},
			},

	export_include_dirs: [		export_include_dirs: [
	"include",		"include",
	],		],

media/codec2/hidl/1.1/utils/Android.bp

+12 −2

Original line number	Original line	Diff line number	Diff line
	@@ -89,11 +89,22 @@ cc_library {
	"libhidlbase",		"libhidlbase",
	"liblog",		"liblog",
	"libstagefright_bufferpool@2.0.1",		"libstagefright_bufferpool@2.0.1",
	"libstagefright_bufferqueue_helper",		"libstagefright_bufferqueue_helper_novndk",
	"libui",		"libui",
	"libutils",		"libutils",
	],		],

			target: {
			vendor: {
			exclude_shared_libs: [
			"libstagefright_bufferqueue_helper_novndk",
			],
			shared_libs: [
			"libstagefright_bufferqueue_helper",
			],
			},
			},

	export_include_dirs: [		export_include_dirs: [
	"include",		"include",
	],		],
	@@ -106,7 +117,6 @@ cc_library {
	"libcodec2_vndk",		"libcodec2_vndk",
	"libhidlbase",		"libhidlbase",
	"libstagefright_bufferpool@2.0.1",		"libstagefright_bufferpool@2.0.1",
	"libstagefright_bufferqueue_helper",
	"libui",		"libui",
	],		],
	}		}

media/libstagefright/bqhelper/Android.bp

+46 −15

Original line number	Original line	Diff line number	Diff line
	cc_library_shared {		cc_defaults {
	name: "libstagefright_bufferqueue_helper",		name: "libstagefright_bufferqueue-defaults",
	vendor_available: true,
	vndk: {
	enabled: true,
	},

	double_loadable: true,		double_loadable: true,

	srcs: [		srcs: [
	"FrameDropper.cpp",		"FrameDropper.cpp",
	"GraphicBufferSource.cpp",		"GraphicBufferSource.cpp",
	@@ -26,7 +22,6 @@ cc_library_shared {
	shared_libs: [		shared_libs: [
	"libbase",		"libbase",
	"libcutils",		"libcutils",
	"libgui",
	"libhidlbase",		"libhidlbase",
	"libhidlmemory",		"libhidlmemory",
	"liblog",		"liblog",
	@@ -52,6 +47,23 @@ cc_library_shared {
	"-Wno-documentation",		"-Wno-documentation",
	],		],

			sanitize: {
			misc_undefined: [
			"signed-integer-overflow",
			"unsigned-integer-overflow",
			],
			cfi: true,
			},
			}

			cc_library_shared {
			name: "libstagefright_bufferqueue_helper",
			defaults: ["libstagefright_bufferqueue-defaults"],
			vendor_available: true,
			vndk: {
			enabled: true,
			},
			shared_libs: [ "libgui" ],
	target: {		target: {
	vendor: {		vendor: {
	exclude_shared_libs: [		exclude_shared_libs: [
	@@ -71,12 +83,31 @@ cc_library_shared {
	],		],
	},		},
	},		},
			}

	sanitize: {		// This lib is needed on devices that doesn't use vndk,
	misc_undefined: [		// on these devices we still don't want libgui to be pulled
	"signed-integer-overflow",		// in onto the apex build. It should only be used by
	"unsigned-integer-overflow",		// libcodec2_hidl@1.x, etc. from service side. It could
			// be removed if all builds are using vndk.
			cc_library_shared {
			name: "libstagefright_bufferqueue_helper_novndk",
			defaults: ["libstagefright_bufferqueue-defaults"],
			apex_available: [
			"com.android.media.swcodec",
			"test_com.android.media.swcodec",
			],
			vendor_available: false,
			static_libs: [
			"libgui_bufferqueue_static",
			],
			shared_libs: [
			"android.hidl.token@1.0-utils",
			"libEGL",
			"libnativewindow",
			"libvndksupport",
			],
			cflags: [
			"-DNO_BINDER",
	],		],
	cfi: true,
	},
	}		}