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

Unified Diff: media/media.gyp

Issue 265263004: Mac Video Capture Device: split VCD into VCD and Factory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: perkj@s suggestions and nits. Created 6 years, 7 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
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index bdf379319f0fa5e0fe5762ef675760cbc731b192..c231314c154472c9afa03f608b4958d7b7bb4686 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -52,7 +52,7 @@
'type': '<(component)',
'dependencies': [
'../base/base.gyp:base',
- '../base/base.gyp:base_i18n',
+ '../base/base.gyp:base_i18n',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../crypto/crypto.gyp:crypto',
'../gpu/gpu.gyp:command_buffer_common',
@@ -475,6 +475,8 @@
'video/capture/mac/platform_video_capturing_mac.h',
'video/capture/mac/video_capture_device_avfoundation_mac.h',
'video/capture/mac/video_capture_device_avfoundation_mac.mm',
+ 'video/capture/mac/video_capture_device_factory_mac.h',
+ 'video/capture/mac/video_capture_device_factory_mac.mm',
'video/capture/mac/video_capture_device_mac.h',
'video/capture/mac/video_capture_device_mac.mm',
'video/capture/mac/video_capture_device_qtkit_mac.h',
@@ -1061,6 +1063,7 @@
'midi/usb_midi_descriptor_parser_unittest.cc',
'midi/usb_midi_input_stream_unittest.cc',
'midi/usb_midi_output_stream_unittest.cc',
+ 'video/capture/fake_video_capture_device_unittest.cc',
'video/capture/video_capture_device_unittest.cc',
'formats/common/offset_byte_queue_unittest.cc',
'formats/webm/cluster_builder.cc',
@@ -1186,6 +1189,11 @@
['OS=="win" and target_arch=="x64"', {
'msvs_disabled_warnings': [ 4267, ],
}],
+ ['OS=="mac"', {
+ 'sources': [
+ 'video/capture/mac/video_capture_device_factory_mac_unittest.mm',
+ ]
+ }],
],
},
{

Powered by Google App Engine
This is Rietveld 408576698