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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/remoting.gyp

Issue 11470028: Move screen capturers to remoting/capturer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 | « remoting/host/win/session_event_executor.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 7d891f987d76a97ffc7a5d595b429e14ff0d9e05..37a36b0bf4f8d67487f4da69228973f1d0875092 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -246,21 +246,62 @@
['enable_remoting_host==1', {
'targets': [
{
- 'target_name': 'differ_block',
+ 'target_name': 'remoting_screen_capturer',
'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
+ 'dependencies': [
+ '../skia/skia.gyp:skia',
+ ],
+ 'sources': [
+ 'capturer/capture_data.cc',
+ 'capturer/capture_data.h',
+ 'capturer/shared_buffer.cc',
+ 'capturer/shared_buffer.h',
+ 'capturer/shared_buffer_factory.h',
+ 'capturer/differ.cc',
+ 'capturer/differ.h',
+ 'capturer/differ_block.cc',
+ 'capturer/differ_block.h',
+ 'capturer/linux/x_server_pixel_buffer.cc',
+ 'capturer/linux/x_server_pixel_buffer.h',
+ 'capturer/mac/scoped_pixel_buffer_object.cc',
+ 'capturer/mac/scoped_pixel_buffer_object.h',
+ 'capturer/mouse_cursor_shape.cc',
+ 'capturer/mouse_cursor_shape.h',
+ 'capturer/video_frame.cc',
+ 'capturer/video_frame.h',
+ 'capturer/video_frame_capturer.h',
+ 'capturer/video_frame_capturer_fake.cc',
+ 'capturer/video_frame_capturer_fake.h',
+ 'capturer/video_frame_capturer_helper.cc',
+ 'capturer/video_frame_capturer_helper.h',
+ 'capturer/video_frame_capturer_linux.cc',
+ 'capturer/video_frame_capturer_mac.mm',
+ 'capturer/video_frame_capturer_win.cc',
+ 'capturer/video_frame_queue.cc',
+ 'capturer/video_frame_queue.h',
+ 'capturer/win/desktop.cc',
+ 'capturer/win/desktop.h',
+ 'capturer/win/scoped_thread_desktop.cc',
+ 'capturer/win/scoped_thread_desktop.h',
+ ],
'conditions': [
[ 'target_arch == "ia32" or target_arch == "x64"', {
'dependencies': [
'differ_block_sse2',
],
}],
+ ['toolkit_uses_gtk==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
+ ],
+ }, { # else toolkit_uses_gtk!=1
+ 'sources!': [
+ '*_gtk.cc',
+ ],
+ }],
],
- 'sources': [
- 'host/differ_block.cc',
- 'host/differ_block.h',
- ],
- }, # end of target differ_block
+ }, # end of target remoting_screen_capturer
{
'target_name': 'remoting_host',
@@ -270,7 +311,7 @@
'remoting_base',
'remoting_jingle_glue',
'remoting_protocol',
- 'differ_block',
+ 'remoting_screen_capturer',
'../crypto/crypto.gyp:crypto',
'../google_apis/google_apis.gyp:google_apis',
'../ipc/ipc.gyp:ipc',
@@ -319,8 +360,6 @@
'host/desktop_session_connector.h',
'host/desktop_session_proxy.cc',
'host/desktop_session_proxy.h',
- 'host/differ.cc',
- 'host/differ.h',
'host/disconnect_window.h',
'host/disconnect_window_gtk.cc',
'host/disconnect_window_mac.h',
@@ -370,8 +409,6 @@
'host/linux/x11_util.h',
'host/linux/x_server_clipboard.cc',
'host/linux/x_server_clipboard.h',
- 'host/linux/x_server_pixel_buffer.cc',
- 'host/linux/x_server_pixel_buffer.h',
'host/local_input_monitor.h',
'host/local_input_monitor_linux.cc',
'host/local_input_monitor_mac.mm',
@@ -380,8 +417,6 @@
'host/local_input_monitor_win.cc',
'host/log_to_server.cc',
'host/log_to_server.h',
- 'host/mac/scoped_pixel_buffer_object.cc',
- 'host/mac/scoped_pixel_buffer_object.h',
'host/mouse_clamping_filter.cc',
'host/mouse_clamping_filter.h',
'host/mouse_move_observer.h',
@@ -418,30 +453,14 @@
'host/usage_stats_consent.h',
'host/usage_stats_consent_mac.cc',
'host/usage_stats_consent_win.cc',
- 'host/video_frame.cc',
- 'host/video_frame.h',
- 'host/video_frame_capturer.h',
- 'host/video_frame_capturer_fake.cc',
- 'host/video_frame_capturer_fake.h',
- 'host/video_frame_capturer_helper.cc',
- 'host/video_frame_capturer_helper.h',
- 'host/video_frame_capturer_linux.cc',
- 'host/video_frame_capturer_mac.mm',
- 'host/video_frame_capturer_win.cc',
- 'host/video_frame_queue.cc',
- 'host/video_frame_queue.h',
'host/video_scheduler.cc',
'host/video_scheduler.h',
'host/vlog_net_log.cc',
'host/vlog_net_log.h',
- 'host/win/desktop.cc',
- 'host/win/desktop.h',
'host/win/launch_process_with_token.cc',
'host/win/launch_process_with_token.h',
'host/win/omaha.cc',
'host/win/omaha.h',
- 'host/win/scoped_thread_desktop.cc',
- 'host/win/scoped_thread_desktop.h',
'host/win/security_descriptor.cc',
'host/win/security_descriptor.h',
'host/win/session_desktop_environment_factory.cc',
@@ -1264,6 +1283,10 @@
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_daemon_version.rc',
'base/scoped_sc_handle_win.h',
+ 'capturer/win/desktop.cc',
+ 'capturer/win/desktop.h',
+ 'capturer/win/scoped_thread_desktop.cc',
+ 'capturer/win/scoped_thread_desktop.h',
'host/chromoting_messages.cc',
'host/chromoting_messages.h',
'host/config_file_watcher.cc',
@@ -1280,16 +1303,12 @@
'host/ipc_constants.h',
'host/sas_injector.h',
'host/sas_injector_win.cc',
- 'host/win/desktop.cc',
- 'host/win/desktop.h',
'host/win/host_service.cc',
'host/win/host_service.h',
'host/win/host_service.rc',
'host/win/host_service_resource.h',
'host/win/omaha.cc',
'host/win/omaha.h',
- 'host/win/scoped_thread_desktop.cc',
- 'host/win/scoped_thread_desktop.h',
'host/win/unprivileged_process_delegate.cc',
'host/win/unprivileged_process_delegate.h',
'host/win/worker_process_launcher.cc',
@@ -1876,8 +1895,6 @@
'base/auto_thread_task_runner.h',
'base/auth_token_util.cc',
'base/auth_token_util.h',
- 'base/capture_data.cc',
- 'base/capture_data.h',
'base/compound_buffer.cc',
'base/compound_buffer.h',
'base/constants.cc',
@@ -1890,9 +1907,6 @@
'base/resources.h',
'base/running_average.cc',
'base/running_average.h',
- 'base/shared_buffer.cc',
- 'base/shared_buffer.h',
- 'base/shared_buffer_factory.h',
'base/socket_reader.cc',
'base/socket_reader.h',
'base/stoppable.cc',
@@ -2129,7 +2143,8 @@
}],
],
'sources': [
- 'host/differ_block_sse2.cc',
+ 'capturer/differ_block_sse2.cc',
+ 'capturer/differ_block_sse2.h',
],
}, # end of target differ_block_sse2
@@ -2166,14 +2181,21 @@
'sources': [
'../chrome/test/base/run_all_remoting_unittests.cc',
'base/auth_token_util_unittest.cc',
- 'base/auto_thread_unittest.cc',
'base/auto_thread_task_runner_unittest.cc',
+ 'base/auto_thread_unittest.cc',
'base/breakpad_win_unittest.cc',
'base/compound_buffer_unittest.cc',
'base/resources_unittest.cc',
- 'base/shared_buffer_unittest.cc',
'base/typed_buffer_unittest.cc',
'base/util_unittest.cc',
+ 'capturer/video_capturer_mock_objects.cc',
+ 'capturer/video_capturer_mock_objects.h',
+ 'capturer/differ_block_unittest.cc',
+ 'capturer/differ_unittest.cc',
+ 'capturer/shared_buffer_unittest.cc',
+ 'capturer/video_frame_capturer_helper_unittest.cc',
+ 'capturer/video_frame_capturer_mac_unittest.cc',
+ 'capturer/video_frame_capturer_unittest.cc',
'client/audio_player_unittest.cc',
'client/key_event_mapper_unittest.cc',
'client/plugin/mac_key_event_processor_unittest.cc',
@@ -2203,8 +2225,6 @@
'host/desktop_session_agent.h',
'host/desktop_session_agent_posix.cc',
'host/desktop_session_agent_win.cc',
- 'host/differ_block_unittest.cc',
- 'host/differ_unittest.cc',
'host/heartbeat_sender_unittest.cc',
'host/host_key_pair_unittest.cc',
'host/host_mock_objects.cc',
@@ -2226,9 +2246,6 @@
'host/setup/oauth_helper_unittest.cc',
'host/setup/pin_validator_unittest.cc',
'host/test_key_pair.h',
- 'host/video_frame_capturer_helper_unittest.cc',
- 'host/video_frame_capturer_mac_unittest.cc',
- 'host/video_frame_capturer_unittest.cc',
'host/video_scheduler_unittest.cc',
'host/win/worker_process_launcher.cc',
'host/win/worker_process_launcher.h',
@@ -2261,9 +2278,9 @@
'protocol/message_reader_unittest.cc',
'protocol/mouse_input_filter_unittest.cc',
'protocol/negotiating_authenticator_unittest.cc',
+ 'protocol/ppapi_module_stub.cc',
'protocol/protocol_mock_objects.cc',
'protocol/protocol_mock_objects.h',
- 'protocol/ppapi_module_stub.cc',
'protocol/ssl_hmac_channel_authenticator_unittest.cc',
'protocol/v2_authenticator_unittest.cc',
],
@@ -2312,6 +2329,8 @@
'remoting_host_setup_base',
],
'sources/': [
+ ['exclude', 'capturer/*'],
+ ['exclude', 'codec/*'],
['exclude', 'host/*'],
]
}],
« no previous file with comments | « remoting/host/win/session_event_executor.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698