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

Side by Side Diff: remoting/remoting.gyp

Issue 10907246: Revert 156889 - Cleanups in Chromoting Host. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/host/win/omaha.cc ('k') | remoting/tools/me2me_virtual_host.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 # TODO(dmaclach): can we pick this up some other way? Right now it's 7 # TODO(dmaclach): can we pick this up some other way? Right now it's
8 # duplicated from chrome.gyp 8 # duplicated from chrome.gyp
9 'chromium_code': 1, 9 'chromium_code': 1,
10 10
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 ], 579 ],
580 'sources': [ 580 'sources': [
581 '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_daemon_version.rc', 581 '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_daemon_version.rc',
582 'base/scoped_sc_handle_win.h', 582 'base/scoped_sc_handle_win.h',
583 'host/branding.cc', 583 'host/branding.cc',
584 'host/branding.h', 584 'host/branding.h',
585 'host/chromoting_messages.cc', 585 'host/chromoting_messages.cc',
586 'host/chromoting_messages.h', 586 'host/chromoting_messages.h',
587 'host/config_file_watcher.cc', 587 'host/config_file_watcher.cc',
588 'host/config_file_watcher.h', 588 'host/config_file_watcher.h',
589 'host/constants.h',
590 'host/constants_win.cc',
589 'host/daemon_process.cc', 591 'host/daemon_process.cc',
590 'host/daemon_process.h', 592 'host/daemon_process.h',
591 'host/daemon_process_win.cc', 593 'host/daemon_process_win.cc',
592 'host/host_exit_codes.h',
593 'host/usage_stats_consent.h', 594 'host/usage_stats_consent.h',
594 'host/usage_stats_consent_win.cc', 595 'host/usage_stats_consent_win.cc',
595 'host/win/host_service.cc', 596 'host/win/host_service.cc',
596 'host/win/host_service.h', 597 'host/win/host_service.h',
597 'host/win/host_service.rc', 598 'host/win/host_service.rc',
598 'host/win/host_service_resource.h', 599 'host/win/host_service_resource.h',
599 'host/win/launch_process_with_token.cc', 600 'host/win/launch_process_with_token.cc',
600 'host/win/launch_process_with_token.h', 601 'host/win/launch_process_with_token.h',
601 'host/win/worker_process_launcher.cc', 602 'host/win/worker_process_launcher.cc',
602 'host/win/worker_process_launcher.h', 603 'host/win/worker_process_launcher.h',
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
870 'type': 'static_library', 871 'type': 'static_library',
871 'variables': { 'enable_wexit_time_destructors': 1, }, 872 'variables': { 'enable_wexit_time_destructors': 1, },
872 'dependencies': [ 873 'dependencies': [
873 '../base/base.gyp:base', 874 '../base/base.gyp:base',
874 ], 875 ],
875 'sources': [ 876 'sources': [
876 'base/breakpad.h', 877 'base/breakpad.h',
877 'base/breakpad_linux.cc', 878 'base/breakpad_linux.cc',
878 'base/breakpad_mac.mm', 879 'base/breakpad_mac.mm',
879 'base/breakpad_win.cc', 880 'base/breakpad_win.cc',
881 'host/constants.h',
882 'host/constants_win.cc',
880 ], 883 ],
881 'conditions': [ 884 'conditions': [
882 ['OS=="win"', { 885 ['OS=="win"', {
883 'dependencies': [ 886 'dependencies': [
884 '../breakpad/breakpad.gyp:breakpad_handler', 887 '../breakpad/breakpad.gyp:breakpad_handler',
885 ], 888 ],
886 }], 889 }],
887 ], 890 ],
888 }, # end of target 'remoting_breakpad' 891 }, # end of target 'remoting_breakpad'
889 892
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
1007 'host/plugin/daemon_controller_win.cc', 1010 'host/plugin/daemon_controller_win.cc',
1008 'host/plugin/daemon_installer_win.cc', 1011 'host/plugin/daemon_installer_win.cc',
1009 'host/plugin/daemon_installer_win.h', 1012 'host/plugin/daemon_installer_win.h',
1010 'host/plugin/host_log_handler.cc', 1013 'host/plugin/host_log_handler.cc',
1011 'host/plugin/host_log_handler.h', 1014 'host/plugin/host_log_handler.h',
1012 'host/plugin/host_plugin.cc', 1015 'host/plugin/host_plugin.cc',
1013 'host/plugin/host_plugin_utils.cc', 1016 'host/plugin/host_plugin_utils.cc',
1014 'host/plugin/host_plugin_utils.h', 1017 'host/plugin/host_plugin_utils.h',
1015 'host/plugin/host_script_object.cc', 1018 'host/plugin/host_script_object.cc',
1016 'host/plugin/host_script_object.h', 1019 'host/plugin/host_script_object.h',
1017 'host/win/omaha.cc',
1018 'host/win/omaha.h',
1019 ], 1020 ],
1020 'conditions': [ 1021 'conditions': [
1021 ['OS=="mac"', { 1022 ['OS=="mac"', {
1022 'mac_bundle': 1, 1023 'mac_bundle': 1,
1023 'xcode_settings': { 1024 'xcode_settings': {
1024 'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)', 1025 'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)',
1025 'INFOPLIST_FILE': 'host/plugin/host_plugin-Info.plist', 1026 'INFOPLIST_FILE': 'host/plugin/host_plugin-Info.plist',
1026 'INFOPLIST_PREPROCESS': 'YES', 1027 'INFOPLIST_PREPROCESS': 'YES',
1027 # TODO(maruel): Use INFOPLIST_PREFIX_HEADER to remove the need to 1028 # TODO(maruel): Use INFOPLIST_PREFIX_HEADER to remove the need to
1028 # duplicate string once 1029 # duplicate string once
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
1264 'host/chromoting_host.cc', 1265 'host/chromoting_host.cc',
1265 'host/chromoting_host.h', 1266 'host/chromoting_host.h',
1266 'host/chromoting_host_context.cc', 1267 'host/chromoting_host_context.cc',
1267 'host/chromoting_host_context.h', 1268 'host/chromoting_host_context.h',
1268 'host/client_session.cc', 1269 'host/client_session.cc',
1269 'host/client_session.h', 1270 'host/client_session.h',
1270 'host/clipboard.h', 1271 'host/clipboard.h',
1271 'host/clipboard_linux.cc', 1272 'host/clipboard_linux.cc',
1272 'host/clipboard_mac.mm', 1273 'host/clipboard_mac.mm',
1273 'host/clipboard_win.cc', 1274 'host/clipboard_win.cc',
1275 'host/constants.h',
1274 'host/constants_mac.cc', 1276 'host/constants_mac.cc',
1275 'host/constants_mac.h', 1277 'host/constants_mac.h',
1278 'host/constants_win.cc',
1276 'host/continue_window.h', 1279 'host/continue_window.h',
1277 'host/continue_window_gtk.cc', 1280 'host/continue_window_gtk.cc',
1278 'host/continue_window_mac.mm', 1281 'host/continue_window_mac.mm',
1279 'host/continue_window_win.cc', 1282 'host/continue_window_win.cc',
1280 'host/desktop_environment.cc', 1283 'host/desktop_environment.cc',
1281 'host/desktop_environment.h', 1284 'host/desktop_environment.h',
1282 'host/desktop_environment_factory.cc', 1285 'host/desktop_environment_factory.cc',
1283 'host/desktop_environment_factory.h', 1286 'host/desktop_environment_factory.h',
1284 'host/differ.cc', 1287 'host/differ.cc',
1285 'host/differ.h', 1288 'host/differ.h',
1286 'host/disconnect_window.h', 1289 'host/disconnect_window.h',
1287 'host/disconnect_window_gtk.cc', 1290 'host/disconnect_window_gtk.cc',
1288 'host/disconnect_window_mac.h', 1291 'host/disconnect_window_mac.h',
1289 'host/disconnect_window_mac.mm', 1292 'host/disconnect_window_mac.mm',
1290 'host/disconnect_window_win.cc', 1293 'host/disconnect_window_win.cc',
1291 'host/dns_blackhole_checker.cc', 1294 'host/dns_blackhole_checker.cc',
1292 'host/dns_blackhole_checker.h', 1295 'host/dns_blackhole_checker.h',
1293 'host/event_executor.h', 1296 'host/event_executor.h',
1294 'host/event_executor_linux.cc', 1297 'host/event_executor_linux.cc',
1295 'host/event_executor_mac.cc', 1298 'host/event_executor_mac.cc',
1296 'host/event_executor_win.cc', 1299 'host/event_executor_win.cc',
1297 'host/gaia_oauth_client.cc', 1300 'host/gaia_oauth_client.cc',
1298 'host/gaia_oauth_client.h', 1301 'host/gaia_oauth_client.h',
1299 'host/heartbeat_sender.cc', 1302 'host/heartbeat_sender.cc',
1300 'host/heartbeat_sender.h', 1303 'host/heartbeat_sender.h',
1301 'host/host_config.cc', 1304 'host/host_config.cc',
1302 'host/host_config.h', 1305 'host/host_config.h',
1303 'host/host_exit_codes.h',
1304 'host/host_key_pair.cc', 1306 'host/host_key_pair.cc',
1305 'host/host_key_pair.h', 1307 'host/host_key_pair.h',
1306 'host/host_port_allocator.cc', 1308 'host/host_port_allocator.cc',
1307 'host/host_port_allocator.h', 1309 'host/host_port_allocator.h',
1308 'host/host_secret.cc', 1310 'host/host_secret.cc',
1309 'host/host_secret.h', 1311 'host/host_secret.h',
1310 'host/host_status_observer.h', 1312 'host/host_status_observer.h',
1311 'host/host_user_interface.cc', 1313 'host/host_user_interface.cc',
1312 'host/host_user_interface.h', 1314 'host/host_user_interface.h',
1313 'host/in_memory_host_config.cc', 1315 'host/in_memory_host_config.cc',
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
1366 'host/video_frame_capturer_fake.h', 1368 'host/video_frame_capturer_fake.h',
1367 'host/video_frame_capturer_helper.cc', 1369 'host/video_frame_capturer_helper.cc',
1368 'host/video_frame_capturer_helper.h', 1370 'host/video_frame_capturer_helper.h',
1369 'host/video_frame_capturer_linux.cc', 1371 'host/video_frame_capturer_linux.cc',
1370 'host/video_frame_capturer_mac.mm', 1372 'host/video_frame_capturer_mac.mm',
1371 'host/video_frame_capturer_win.cc', 1373 'host/video_frame_capturer_win.cc',
1372 'host/vlog_net_log.cc', 1374 'host/vlog_net_log.cc',
1373 'host/vlog_net_log.h', 1375 'host/vlog_net_log.h',
1374 'host/win/desktop.cc', 1376 'host/win/desktop.cc',
1375 'host/win/desktop.h', 1377 'host/win/desktop.h',
1376 'host/win/omaha.cc',
1377 'host/win/omaha.h',
1378 'host/win/scoped_thread_desktop.cc', 1378 'host/win/scoped_thread_desktop.cc',
1379 'host/win/scoped_thread_desktop.h', 1379 'host/win/scoped_thread_desktop.h',
1380 'host/win/session_desktop_environment_factory.cc', 1380 'host/win/session_desktop_environment_factory.cc',
1381 'host/win/session_desktop_environment_factory.h', 1381 'host/win/session_desktop_environment_factory.h',
1382 'host/win/session_event_executor.cc', 1382 'host/win/session_event_executor.cc',
1383 'host/win/session_event_executor.h', 1383 'host/win/session_event_executor.h',
1384 'host/x_server_pixel_buffer.cc', 1384 'host/x_server_pixel_buffer.cc',
1385 'host/x_server_pixel_buffer.h', 1385 'host/x_server_pixel_buffer.h',
1386 ], 1386 ],
1387 'conditions': [ 1387 'conditions': [
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
1916 '../base/allocator/allocator.gyp:allocator', 1916 '../base/allocator/allocator.gyp:allocator',
1917 ], 1917 ],
1918 }, 1918 },
1919 ], 1919 ],
1920 ], 1920 ],
1921 }], 1921 }],
1922 ], # end of 'conditions' 1922 ], # end of 'conditions'
1923 }, # end of target 'remoting_unittests' 1923 }, # end of target 'remoting_unittests'
1924 ], # end of targets 1924 ], # end of targets
1925 } 1925 }
OLDNEW
« no previous file with comments | « remoting/host/win/omaha.cc ('k') | remoting/tools/me2me_virtual_host.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698