Index: media/media.gyp |
diff --git a/media/media.gyp b/media/media.gyp |
index 089778c1599c959570a067a096484cda3f662e42..44d4231feb03a5ff2b46910bc15a422f43882072 100644 |
--- a/media/media.gyp |
+++ b/media/media.gyp |
@@ -50,6 +50,7 @@ |
'../crypto/crypto.gyp:crypto', |
'../skia/skia.gyp:skia', |
'../third_party/opus/opus.gyp:opus', |
+ '../third_party/webrtc/modules/modules.gyp:desktop_capture', |
'../ui/ui.gyp:ui', |
], |
'defines': [ |
@@ -368,20 +369,13 @@ |
'video/capture/screen/differ.h', |
'video/capture/screen/differ_block.cc', |
'video/capture/screen/differ_block.h', |
- 'video/capture/screen/x11/x_server_pixel_buffer.cc', |
- 'video/capture/screen/x11/x_server_pixel_buffer.h', |
- 'video/capture/screen/mac/desktop_configuration.mm', |
'video/capture/screen/mac/desktop_configuration.h', |
+ 'video/capture/screen/mac/desktop_configuration.mm', |
'video/capture/screen/mac/scoped_pixel_buffer_object.cc', |
'video/capture/screen/mac/scoped_pixel_buffer_object.h', |
- 'video/capture/screen/mouse_cursor_shape.cc', |
'video/capture/screen/mouse_cursor_shape.h', |
- 'video/capture/screen/screen_capture_data.cc', |
- 'video/capture/screen/screen_capture_data.h', |
'video/capture/screen/screen_capture_device.cc', |
'video/capture/screen/screen_capture_device.h', |
- 'video/capture/screen/screen_capture_frame.cc', |
- 'video/capture/screen/screen_capture_frame.h', |
'video/capture/screen/screen_capture_frame_queue.cc', |
'video/capture/screen/screen_capture_frame_queue.h', |
'video/capture/screen/screen_capturer.h', |
@@ -389,16 +383,18 @@ |
'video/capture/screen/screen_capturer_fake.h', |
'video/capture/screen/screen_capturer_helper.cc', |
'video/capture/screen/screen_capturer_helper.h', |
- 'video/capture/screen/screen_capturer_x11.cc', |
'video/capture/screen/screen_capturer_mac.mm', |
'video/capture/screen/screen_capturer_null.cc', |
'video/capture/screen/screen_capturer_win.cc', |
- 'video/capture/screen/shared_buffer.cc', |
- 'video/capture/screen/shared_buffer.h', |
+ 'video/capture/screen/screen_capturer_x11.cc', |
+ 'video/capture/screen/shared_desktop_frame.cc', |
+ 'video/capture/screen/shared_desktop_frame.h', |
'video/capture/screen/win/desktop.cc', |
'video/capture/screen/win/desktop.h', |
'video/capture/screen/win/scoped_thread_desktop.cc', |
'video/capture/screen/win/scoped_thread_desktop.h', |
+ 'video/capture/screen/x11/x_server_pixel_buffer.cc', |
+ 'video/capture/screen/x11/x_server_pixel_buffer.h', |
'video/capture/video_capture.h', |
'video/capture/video_capture_device.h', |
'video/capture/video_capture_device_dummy.cc', |
@@ -851,6 +847,9 @@ |
'sources/': [ |
['exclude', '^video/capture/screen/'], |
], |
+ 'dependencies!': [ |
Ami GONE FROM CHROMIUM
2013/05/14 00:23:38
Do you need a copy of this at l.1093?
Sergey Ulanov
2013/05/14 00:31:19
Done. (it's just an optimization for faster compil
|
+ '../third_party/webrtc/modules/modules.gyp:desktop_capture', |
+ ], |
}], |
[ 'screen_capture_supported==1 and (target_arch=="ia32" or target_arch=="x64")', { |
'dependencies': [ |
@@ -897,6 +896,7 @@ |
'../testing/gmock.gyp:gmock', |
'../testing/gtest.gyp:gtest', |
'../ui/ui.gyp:ui', |
+ '../third_party/webrtc/modules/modules.gyp:desktop_capture', |
], |
'sources': [ |
'audio/async_socket_io_handler_unittest.cc', |
@@ -987,7 +987,6 @@ |
'filters/video_renderer_base_unittest.cc', |
'video/capture/screen/differ_block_unittest.cc', |
'video/capture/screen/differ_unittest.cc', |
- 'video/capture/screen/shared_buffer_unittest.cc', |
'video/capture/screen/screen_capture_device_unittest.cc', |
'video/capture/screen/screen_capturer_helper_unittest.cc', |
'video/capture/screen/screen_capturer_mac_unittest.cc', |
@@ -1123,6 +1122,7 @@ |
'../skia/skia.gyp:skia', |
'../testing/gmock.gyp:gmock', |
'../testing/gtest.gyp:gtest', |
+ '../third_party/webrtc/modules/modules.gyp:desktop_capture', |
], |
'sources': [ |
'audio/mock_audio_manager.cc', |