Merge "Unify libstagefright_bufferqueue_helper and client.so" (89b420ca) · Commits · e / os / android_frameworks_av

media/codec2/sfplugin/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ cc_library_shared {
		"libmedia_codeclist",
		"libmedia_omx",
		"libsfplugin_ccodec_utils",
		"libstagefright_bufferqueue_helper_client",
		"libstagefright_bufferqueue_helper",
		"libstagefright_codecbase",
		"libstagefright_foundation",
		"libstagefright_omx",

media/libstagefright/bqhelper/Android.bp

+30 −37

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

		double_loadable: true,
		srcs: [
		"FrameDropper.cpp",
		@@ -21,6 +26,7 @@ cc_defaults {
		shared_libs: [
		"libbase",
		"libcutils",
		"libgui",
		"libhidlbase",
		"libhidlmemory",
		"liblog",
		@@ -29,12 +35,14 @@ cc_defaults {
		"libutils",

		"android.hardware.graphics.bufferqueue@1.0",
		"android.hardware.graphics.bufferqueue@2.0",
		],

		export_shared_lib_headers: [
		"libhidlmemory",
		"libstagefright_foundation",
		"android.hardware.graphics.bufferqueue@1.0",
		"android.hardware.graphics.bufferqueue@2.0",
		],

		cflags: [
		@@ -44,46 +52,31 @@ cc_defaults {
		"-Wno-documentation",
		],

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

		cc_library_shared {
		name: "libstagefright_bufferqueue_helper",
		defaults: ["libstagefright_bufferqueue-defaults"],
		vendor_available: true,
		vndk: {
		enabled: true,
		},
		static_libs: [
		"libgui_bufferqueue_static"
		"libgui_bufferqueue_static",
		],
		shared_libs: [
		"android.hardware.graphics.bufferqueue@2.0",
		"android.hidl.token@1.0-utils",
		"libEGL",
		"libnativewindow",
		"libvndksupport",
		],
		export_shared_lib_headers: [
		"android.hardware.graphics.bufferqueue@2.0",
		],
		cflags: [
		"-DNO_BINDER",
		],
		}
		},
		},

		cc_library_shared {
		name: "libstagefright_bufferqueue_helper_client",
		defaults: ["libstagefright_bufferqueue-defaults"],
		vendor_available: false,
		shared_libs: [
		"libgui"
		sanitize: {
		misc_undefined: [
		"signed-integer-overflow",
		"unsigned-integer-overflow",
		],
		cfi: true,
		},
		}