Fix OMX dependencies.
Note, filed b/62923763 to cleanup xmlparser includes.
Bug: 37343418
Test: builds with BOARD_VNDK_VERSION=current
Test: (sanity) YouTube on a device
Test: (sanity) Camera on a device
Test: (sanity) watch (part of a) movie on a device
Test: (sanity) YouTube on marlin
Test: (sanity) Camera on marlin
Test: (sanity) watch (part of a) movie on marlin
Test: (sanity) YouTube on angler
Test: (sanity) Camera on angler
Test: (sanity) watch (part of a) movie on angler
Change-Id: I461f999122da56cabb9d4d15b182899ced3b0120
diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index 8cf8005..bbe97ee 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -22,24 +22,117 @@
clang: true,
}
-cc_library_shared {
- name: "libmedia",
+// TODO(b/35449087): merge back with libmedia when OMX implementatoins
+// 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: {
local_include_dirs: ["aidl"],
export_aidl_headers: true,
},
- srcs: [
- "aidl/android/IGraphicBufferSource.aidl",
- "aidl/android/IOMXBufferSource.aidl",
+ shared_libs: [
+ "android.hidl.memory@1.0",
+ "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",
"IHDCP.cpp",
"BufferingSettings.cpp",
"mediaplayer.cpp",
- "IMediaCodecList.cpp",
- "IMediaCodecService.cpp",
"IMediaHTTPConnection.cpp",
"IMediaHTTPService.cpp",
"IMediaExtractor.cpp",
@@ -55,9 +148,6 @@
"IResourceManagerClient.cpp",
"IResourceManagerService.cpp",
"IStreamSource.cpp",
- "MediaCodecBuffer.cpp",
- "MediaCodecInfo.cpp",
- "MediaDefs.cpp",
"MediaUtils.cpp",
"Metadata.cpp",
"mediarecorder.cpp",
@@ -66,7 +156,6 @@
"MidiDeviceInfo.cpp",
"MidiIoWrapper.cpp",
"JetPlayer.cpp",
- "IOMX.cpp",
"MediaScanner.cpp",
"MediaScannerClient.cpp",
"CharacterEncodingDetector.cpp",
@@ -74,14 +163,8 @@
"MediaProfiles.cpp",
"MediaResource.cpp",
"MediaResourcePolicy.cpp",
- "OMXBuffer.cpp",
"Visualizer.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: [
@@ -109,11 +192,8 @@
"libhwbinder",
"libhidlmemory",
"android.hidl.memory@1.0",
- "android.hidl.token@1.0-utils",
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.bufferqueue@1.0",
- "android.hardware.media@1.0",
- "android.hardware.media.omx@1.0",
],
export_shared_lib_headers: [
@@ -122,8 +202,6 @@
"libicui18n",
"libsonivox",
"libmediadrm",
- "android.hidl.token@1.0-utils",
- "android.hardware.media.omx@1.0",
"android.hidl.memory@1.0",
],
@@ -139,7 +217,6 @@
],
export_include_dirs: [
- "aidl",
"include",
],
cflags: [