Fix OMX dependencies. (6be8c055) · Commits · e / os / android_frameworks_av

CleanSpec.mk

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -77,6 +77,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libvisualizer.so
	$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libreverbwrapper.so)		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libreverbwrapper.so)
	$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libbundlewrapper.so)		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libbundlewrapper.so)
	$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libaudiopreprocessing.so)		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libaudiopreprocessing.so)
			$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libmediacodecservice.so)

	# ************************************************		# ************************************************
	# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

media/libmedia/Android.bp

+100 −23

Original line number	Original line	Diff line number	Diff line
	@@ -19,24 +19,117 @@ cc_library {
	clang: true,		clang: true,
	}		}

	cc_library_shared {		// TODO(b/35449087): merge back with libmedia when OMX implementatoins
	name: "libmedia",		// no longer use aidl wrappers (or remove OMX component form libmedia)
			cc_defaults {
			name: "libmedia_omx_defaults",

			srcs: [
			"aidl/android/IGraphicBufferSource.aidl",
			"aidl/android/IOMXBufferSource.aidl",

			"IMediaCodecList.cpp",
			"IMediaCodecService.cpp",
			"IOMX.cpp",
			"MediaCodecBuffer.cpp",
			"MediaCodecInfo.cpp",
			"MediaDefs.cpp",
			"OMXBuffer.cpp",
			"omx/1.0/WGraphicBufferSource.cpp",
			"omx/1.0/WOmx.cpp",
			"omx/1.0/WOmxBufferSource.cpp",
			"omx/1.0/WOmxNode.cpp",
			"omx/1.0/WOmxObserver.cpp",
			],

	aidl: {		aidl: {
	local_include_dirs: ["aidl"],		local_include_dirs: ["aidl"],
	export_aidl_headers: true,		export_aidl_headers: true,
	},		},

	srcs: [		shared_libs: [
	"aidl/android/IGraphicBufferSource.aidl",		"android.hidl.memory@1.0",
	"aidl/android/IOMXBufferSource.aidl",		"android.hidl.token@1.0-utils",
			"android.hardware.media.omx@1.0",
			"android.hardware.media@1.0",
			"libbase",
			"libbinder",
			"libcutils",
			"libgui",
			"libhidlbase",
			"libhidlmemory",
			"libhidltransport",
			"libhwbinder",
			"liblog",
			"libstagefright_foundation",
			"libui",
			"libutils",
			],

			include_dirs: [
			"frameworks/av/include", // for media/vndk/xmlparser/1.0/MediaCodecsXmlParser.h
			"frameworks/av/include/media",
			"frameworks/native/include", // for media/hardware/MetadataBufferType.h
			"frameworks/native/include/media/openmax",
			"frameworks/av/media/libstagefright",
			],

			export_shared_lib_headers: [
			"android.hidl.memory@1.0",
			"android.hidl.token@1.0-utils",
			"android.hardware.media.omx@1.0",
			"android.hardware.media@1.0",
			"libhidlmemory",
			"libstagefright_foundation",
			"libui",
			],

			header_libs: [
			"libmedia_headers",
			],

			export_header_lib_headers: [
			"libmedia_headers",
			],

			export_include_dirs: [
			"aidl",
			],

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

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

			cc_library_shared {
			name: "libmedia_omx",
			vendor_available: true,

			defaults: ["libmedia_omx_defaults"],
			}

			cc_library_shared {
			name: "libmedia",
			defaults: ["libmedia_omx_defaults"],

			srcs: [
	"IDataSource.cpp",		"IDataSource.cpp",
	"IHDCP.cpp",		"IHDCP.cpp",
	"BufferingSettings.cpp",		"BufferingSettings.cpp",
	"mediaplayer.cpp",		"mediaplayer.cpp",
	"IMediaCodecList.cpp",
	"IMediaCodecService.cpp",
	"IMediaHTTPConnection.cpp",		"IMediaHTTPConnection.cpp",
	"IMediaHTTPService.cpp",		"IMediaHTTPService.cpp",
	"IMediaExtractor.cpp",		"IMediaExtractor.cpp",
	@@ -52,9 +145,6 @@ cc_library_shared {
	"IResourceManagerClient.cpp",		"IResourceManagerClient.cpp",
	"IResourceManagerService.cpp",		"IResourceManagerService.cpp",
	"IStreamSource.cpp",		"IStreamSource.cpp",
	"MediaCodecBuffer.cpp",
	"MediaCodecInfo.cpp",
	"MediaDefs.cpp",
	"MediaUtils.cpp",		"MediaUtils.cpp",
	"Metadata.cpp",		"Metadata.cpp",
	"mediarecorder.cpp",		"mediarecorder.cpp",
	@@ -63,7 +153,6 @@ cc_library_shared {
	"MidiDeviceInfo.cpp",		"MidiDeviceInfo.cpp",
	"MidiIoWrapper.cpp",		"MidiIoWrapper.cpp",
	"JetPlayer.cpp",		"JetPlayer.cpp",
	"IOMX.cpp",
	"MediaScanner.cpp",		"MediaScanner.cpp",
	"MediaScannerClient.cpp",		"MediaScannerClient.cpp",
	"CharacterEncodingDetector.cpp",		"CharacterEncodingDetector.cpp",
	@@ -71,14 +160,8 @@ cc_library_shared {
	"MediaProfiles.cpp",		"MediaProfiles.cpp",
	"MediaResource.cpp",		"MediaResource.cpp",
	"MediaResourcePolicy.cpp",		"MediaResourcePolicy.cpp",
	"OMXBuffer.cpp",
	"Visualizer.cpp",		"Visualizer.cpp",
	"StringArray.cpp",		"StringArray.cpp",
	"omx/1.0/WGraphicBufferSource.cpp",
	"omx/1.0/WOmx.cpp",
	"omx/1.0/WOmxBufferSource.cpp",
	"omx/1.0/WOmxNode.cpp",
	"omx/1.0/WOmxObserver.cpp",
	],		],

	shared_libs: [		shared_libs: [
	@@ -106,11 +189,8 @@ cc_library_shared {
	"libhwbinder",		"libhwbinder",
	"libhidlmemory",		"libhidlmemory",
	"android.hidl.memory@1.0",		"android.hidl.memory@1.0",
	"android.hidl.token@1.0-utils",
	"android.hardware.graphics.common@1.0",		"android.hardware.graphics.common@1.0",
	"android.hardware.graphics.bufferqueue@1.0",		"android.hardware.graphics.bufferqueue@1.0",
	"android.hardware.media@1.0",
	"android.hardware.media.omx@1.0",
	],		],

	export_shared_lib_headers: [		export_shared_lib_headers: [
	@@ -119,8 +199,6 @@ cc_library_shared {
	"libicui18n",		"libicui18n",
	"libsonivox",		"libsonivox",
	"libmediadrm",		"libmediadrm",
	"android.hidl.token@1.0-utils",
	"android.hardware.media.omx@1.0",
	"android.hidl.memory@1.0",		"android.hidl.memory@1.0",
	],		],

	@@ -136,7 +214,6 @@ cc_library_shared {
	],		],

	export_include_dirs: [		export_include_dirs: [
	"aidl",
	"include",		"include",
	],		],
	cflags: [		cflags: [

media/libstagefright/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -89,7 +89,6 @@ cc_library_shared {
	"libmediautils",		"libmediautils",
	"libnetd_client",		"libnetd_client",
	"libsonivox",		"libsonivox",
	"libstagefright_omx",
	"libui",		"libui",
	"libutils",		"libutils",
	"libvorbisidec",		"libvorbisidec",
	@@ -114,6 +113,7 @@ cc_library_shared {
	"libstagefright_aacenc",		"libstagefright_aacenc",
	"libstagefright_matroska",		"libstagefright_matroska",
	"libstagefright_mediafilter",		"libstagefright_mediafilter",
			"libstagefright_omx_utils",
	"libstagefright_webm",		"libstagefright_webm",
	"libstagefright_timedtext",		"libstagefright_timedtext",
	"libvpx",		"libvpx",

media/libstagefright/omx/Android.bp

+29 −2

Original line number	Original line	Diff line number	Diff line
	cc_library_shared {		cc_library_shared {
	name: "libstagefright_omx",		name: "libstagefright_omx",
			vendor_available: true,

	srcs: [		srcs: [
	"FrameDropper.cpp",		"FrameDropper.cpp",
	@@ -25,16 +26,19 @@ cc_library_shared {
	],		],

	include_dirs: [		include_dirs: [
			"frameworks/av/include", // for media/vndk/xmlparser/1.0/MediaCodecsXmlParser.h
			"frameworks/av/include/media/",
	"frameworks/av/media/libstagefright",		"frameworks/av/media/libstagefright",
			"frameworks/av/media/libstagefright/include",
			"frameworks/native/include", // for media/hardware/MetadataBufferType.h
	"frameworks/native/include/media/hardware",		"frameworks/native/include/media/hardware",
	// TODO: export this?
	"frameworks/native/include/media/openmax",		"frameworks/native/include/media/openmax",
	],		],

	shared_libs: [		shared_libs: [
	"libbase",		"libbase",
	"libbinder",		"libbinder",
	"libmedia",		"libmedia_omx",
	"libutils",		"libutils",
	"liblog",		"liblog",
	"libui",		"libui",
	@@ -45,8 +49,10 @@ cc_library_shared {
	"libhidlbase",		"libhidlbase",
	"libhidlmemory",		"libhidlmemory",
	"libhidltransport",		"libhidltransport",
			"libnativewindow", // TODO(b/62923479): use header library
	"libstagefright_xmlparser@1.0",		"libstagefright_xmlparser@1.0",
	"android.hidl.memory@1.0",		"android.hidl.memory@1.0",
			"android.hidl.token@1.0-utils",
	"android.hardware.media@1.0",		"android.hardware.media@1.0",
	"android.hardware.media.omx@1.0",		"android.hardware.media.omx@1.0",
	"android.hardware.graphics.common@1.0",		"android.hardware.graphics.common@1.0",
	@@ -74,6 +80,27 @@ cc_library_shared {
	},		},
	}		}

			cc_library_static {
			name: "libstagefright_omx_utils",
			srcs: ["OMXUtils.cpp"],
			include_dirs: [
			"frameworks/av/media/libstagefright",
			"frameworks/native/include/media/hardware",
			"frameworks/native/include/media/openmax",
			],
			shared_libs: ["libmedia"],
			sanitize: {
			misc_undefined: [
			"signed-integer-overflow",
			"unsigned-integer-overflow",
			],
			cfi: true,
			diag: {
			cfi: true,
			},
			},
			}

	//###############################################################################		//###############################################################################

	subdirs = ["tests"]		subdirs = ["tests"]

media/vndk/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	subdirs = [		subdirs = [
	"*",		"xmlparser/1.0",
	]		]