libmedia: separate codeclist from libmedia

Test: build.
Bug: 139201422
Change-Id: I150c3bd04cc68a3b96a8762ba193fc1595ee6da3
gugelfrei
Dongwon Kang 5 years ago
parent 3b93ca583a
commit 23a180b0c2

@ -8,7 +8,7 @@ LOCAL_SRC_FILES:= \
SineSource.cpp SineSource.cpp
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libstagefright libmedia libmedia_omx libutils libbinder \ libstagefright libmedia libmedia_codeclist libutils libbinder \
libstagefright_foundation libjpeg libui libgui libcutils liblog \ libstagefright_foundation libjpeg libui libgui libcutils liblog \
libhidlbase \ libhidlbase \
android.hardware.media.omx@1.0 \ android.hardware.media.omx@1.0 \

@ -38,7 +38,7 @@ cc_library_shared {
"libhidlallocatorutils", "libhidlallocatorutils",
"libhidlbase", "libhidlbase",
"liblog", "liblog",
"libmedia", "libmedia_codeclist",
"libmedia_omx", "libmedia_omx",
"libsfplugin_ccodec_utils", "libsfplugin_ccodec_utils",
"libstagefright_bufferqueue_helper", "libstagefright_bufferqueue_helper",

@ -215,6 +215,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 { cc_library {
name: "libmedia", name: "libmedia",
@ -222,7 +265,6 @@ cc_library {
"IDataSource.cpp", "IDataSource.cpp",
"BufferingSettings.cpp", "BufferingSettings.cpp",
"mediaplayer.cpp", "mediaplayer.cpp",
"IMediaCodecList.cpp",
"IMediaHTTPConnection.cpp", "IMediaHTTPConnection.cpp",
"IMediaHTTPService.cpp", "IMediaHTTPService.cpp",
"IMediaExtractor.cpp", "IMediaExtractor.cpp",
@ -238,7 +280,6 @@ cc_library {
"IResourceManagerClient.cpp", "IResourceManagerClient.cpp",
"IResourceManagerService.cpp", "IResourceManagerService.cpp",
"IStreamSource.cpp", "IStreamSource.cpp",
"MediaCodecInfo.cpp",
"MediaUtils.cpp", "MediaUtils.cpp",
"Metadata.cpp", "Metadata.cpp",
"mediarecorder.cpp", "mediarecorder.cpp",
@ -291,6 +332,7 @@ cc_library {
"libdl", "libdl",
"libaudioutils", "libaudioutils",
"libaudioclient", "libaudioclient",
"libmedia_codeclist",
"libmedia_omx", "libmedia_omx",
], ],

@ -26,6 +26,7 @@ cc_library_shared {
"libhidlbase", "libhidlbase",
"liblog", "liblog",
"libmedia", "libmedia",
"libmedia_codeclist",
"libmedia_omx", "libmedia_omx",
"libmediadrm", "libmediadrm",
"libmediametrics", "libmediametrics",

@ -61,7 +61,7 @@ cc_library_shared {
shared_libs: [ shared_libs: [
"libgui", "libgui",
"liblog", "liblog",
"libmedia", "libmedia_codeclist",
"libstagefright_foundation", "libstagefright_foundation",
"libui", "libui",
"libutils", "libutils",
@ -185,6 +185,7 @@ cc_library {
"libgui", "libgui",
"liblog", "liblog",
"libmedia", "libmedia",
"libmedia_codeclist",
"libmedia_omx", "libmedia_omx",
"libmedia_omx_client", "libmedia_omx_client",
"libaudioclient", "libaudioclient",

@ -88,6 +88,7 @@ cc_library_shared {
"libhardware", "libhardware",
"libhidlbase", "libhidlbase",
"libjpeg", "libjpeg",
"libmedia_codeclist",
"libmedia_omx", "libmedia_omx",
"libmemunreachable", "libmemunreachable",
"libsensorprivacy", "libsensorprivacy",

Loading…
Cancel
Save