Merge "libmedia: separate codeclist from libmedia" am: 1f72838954 (81d1403f) · Commits · e / os / android_frameworks_av

cmds/stagefright/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ LOCAL_SRC_FILES:= \
		SineSource.cpp

		LOCAL_SHARED_LIBRARIES := \
		libstagefright libmedia libmedia_omx libutils libbinder \
		libstagefright libmedia libmedia_codeclist libutils libbinder \
		libstagefright_foundation libjpeg libui libgui libcutils liblog \
		libhidlbase libdatasource \
		android.hardware.media.omx@1.0 \

+2 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ cc_library_shared {
		header_libs: [
		"libcodec2_internal",
		"libmediadrm_headers",
		"media_ndk_headers",
		],

		shared_libs: [
		@@ -40,7 +41,7 @@ cc_library_shared {
		"libhidlallocatorutils",
		"libhidlbase",
		"liblog",
		"libmedia",
		"libmedia_codeclist",
		"libmedia_omx",
		"libsfplugin_ccodec_utils",
		"libstagefright_bufferqueue_helper",

+44 −0

Original line number	Diff line number	Diff line
		@@ -217,6 +217,49 @@ cc_library_static {
		},
		}

		cc_library_shared {
		name: "libmedia_codeclist",

		srcs: [
		"IMediaCodecList.cpp",
		"MediaCodecInfo.cpp",
		],

		local_include_dirs: [
		"include",
		],

		shared_libs: [
		"android.hardware.media.omx@1.0",
		"libbinder",
		"liblog",
		"libstagefright_foundation",
		"libutils",
		],

		include_dirs: [
		"system/libhidl/transport/token/1.0/utils/include",
		],

		export_include_dirs: [
		"include",
		],

		cflags: [
		"-Werror",
		"-Wno-error=deprecated-declarations",
		"-Wall",
		],

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

		cc_library {
		name: "libmedia",

		@@ -291,6 +334,7 @@ cc_library {
		"libdl",
		"libaudioutils",
		"libaudioclient",
		"libmedia_codeclist",
		"libmedia_omx",
		],

+1 −0

+2 −1