Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Unified Diff: media/BUILD.gn

Issue 1085843003: Revert of Web MIDI: split build rules for media/midi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_tests.gypi ('k') | media/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 7f2dd6a4873d62f0c438bdca4509668585f7b3a6..559e29ade71326f11e9f536314467371637e5e9c 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -31,6 +31,9 @@
}
if (use_cras) {
defines += [ "USE_CRAS" ]
+ }
+ if (use_alsa) {
+ defines += [ "USE_ALSA" ]
}
}
@@ -176,6 +179,30 @@
"formats/webm/webm_video_client.h",
"formats/webm/webm_webvtt_parser.cc",
"formats/webm/webm_webvtt_parser.h",
+ "midi/midi_manager.cc",
+ "midi/midi_manager.h",
+ "midi/midi_manager_mac.cc",
+ "midi/midi_manager_mac.h",
+ "midi/midi_manager_usb.cc",
+ "midi/midi_manager_usb.h",
+ "midi/midi_manager_win.cc",
+ "midi/midi_manager_win.h",
+ "midi/midi_message_queue.cc",
+ "midi/midi_message_queue.h",
+ "midi/midi_message_util.cc",
+ "midi/midi_message_util.h",
+ "midi/midi_port_info.cc",
+ "midi/midi_port_info.h",
+ "midi/midi_scheduler.cc",
+ "midi/midi_scheduler.h",
+ "midi/usb_midi_descriptor_parser.cc",
+ "midi/usb_midi_descriptor_parser.h",
+ "midi/usb_midi_device.h",
+ "midi/usb_midi_input_stream.cc",
+ "midi/usb_midi_input_stream.h",
+ "midi/usb_midi_jack.h",
+ "midi/usb_midi_output_stream.cc",
+ "midi/usb_midi_output_stream.h",
"renderers/audio_renderer_impl.cc",
"renderers/audio_renderer_impl.h",
"renderers/gpu_video_accelerator_factories.h",
@@ -316,6 +343,11 @@
]
} else {
sources += [
+ "midi/midi_manager_android.cc",
+ "midi/usb_midi_device_android.cc",
+ "midi/usb_midi_device_android.h",
+ "midi/usb_midi_device_factory_android.cc",
+ "midi/usb_midi_device_factory_android.h",
"video/capture/android/video_capture_device_android.cc",
"video/capture/android/video_capture_device_android.h",
"video/capture/android/video_capture_device_factory_android.cc",
@@ -336,6 +368,18 @@
]
}
+ if (use_alsa) {
+ libs += [ "asound" ]
+ sources += [
+ "midi/midi_manager_alsa.cc",
+ "midi/midi_manager_alsa.h",
+ ]
+ }
+
+ if (use_udev) {
+ deps += [ "//device/udev_linux" ]
+ }
+
# A simple WebM encoder for animated avatars on ChromeOS.
if (use_ozone) {
@@ -359,6 +403,7 @@
"//third_party/decklink",
]
libs += [
+ "CoreMIDI.framework",
"CoreVideo.framework",
"OpenGL.framework",
"QTKit.framework",
@@ -377,6 +422,8 @@
}
if (is_win) {
+ deps += [ "//device/usb" ]
+
libs += [
"mf.lib",
"mfplat.lib",
@@ -528,6 +575,13 @@
"formats/webm/webm_parser_unittest.cc",
"formats/webm/webm_tracks_parser_unittest.cc",
"formats/webm/webm_webvtt_parser_unittest.cc",
+ "midi/midi_manager_unittest.cc",
+ "midi/midi_manager_usb_unittest.cc",
+ "midi/midi_message_queue_unittest.cc",
+ "midi/midi_message_util_unittest.cc",
+ "midi/usb_midi_descriptor_parser_unittest.cc",
+ "midi/usb_midi_input_stream_unittest.cc",
+ "midi/usb_midi_output_stream_unittest.cc",
"renderers/audio_renderer_impl_unittest.cc",
"renderers/renderer_impl_unittest.cc",
"renderers/video_renderer_impl_unittest.cc",
@@ -615,8 +669,18 @@
}
if (is_mac) {
- sources +=
- [ "video/capture/mac/video_capture_device_factory_mac_unittest.mm" ]
+ sources += [
+ "midi/midi_manager_mac_unittest.cc",
+ "video/capture/mac/video_capture_device_factory_mac_unittest.mm",
+ ]
+ libs = [
+ # Required by midi_manager_mac_unittest.cc.
+ "CoreMIDI.framework",
+ ]
+ }
+
+ if (use_alsa) {
+ sources += [ "midi/midi_manager_alsa_unittest.cc" ]
}
# include_dirs += [
« no previous file with comments | « content/content_tests.gypi ('k') | media/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698