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

Side by Side Diff: remoting/remoting.gyp

Issue 10988004: Revert 158366 - Cleanups in Chromoting Host. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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/wts_session_process_launcher.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 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 ], 586 ],
587 'sources': [ 587 'sources': [
588 '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_daemon_version.rc', 588 '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_daemon_version.rc',
589 'base/scoped_sc_handle_win.h', 589 'base/scoped_sc_handle_win.h',
590 'host/branding.cc', 590 'host/branding.cc',
591 'host/branding.h', 591 'host/branding.h',
592 'host/chromoting_messages.cc', 592 'host/chromoting_messages.cc',
593 'host/chromoting_messages.h', 593 'host/chromoting_messages.h',
594 'host/config_file_watcher.cc', 594 'host/config_file_watcher.cc',
595 'host/config_file_watcher.h', 595 'host/config_file_watcher.h',
596 'host/constants.h',
597 'host/constants_win.cc',
596 'host/daemon_process.cc', 598 'host/daemon_process.cc',
597 'host/daemon_process.h', 599 'host/daemon_process.h',
598 'host/daemon_process_win.cc', 600 'host/daemon_process_win.cc',
599 'host/host_exit_codes.h',
600 'host/usage_stats_consent.h', 601 'host/usage_stats_consent.h',
601 'host/usage_stats_consent_win.cc', 602 'host/usage_stats_consent_win.cc',
602 'host/win/host_service.cc', 603 'host/win/host_service.cc',
603 'host/win/host_service.h', 604 'host/win/host_service.h',
604 'host/win/host_service.rc', 605 'host/win/host_service.rc',
605 'host/win/host_service_resource.h', 606 'host/win/host_service_resource.h',
606 'host/win/launch_process_with_token.cc', 607 'host/win/launch_process_with_token.cc',
607 'host/win/launch_process_with_token.h', 608 'host/win/launch_process_with_token.h',
608 'host/win/worker_process_launcher.cc', 609 'host/win/worker_process_launcher.cc',
609 'host/win/worker_process_launcher.h', 610 'host/win/worker_process_launcher.h',
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
938 'type': 'static_library', 939 'type': 'static_library',
939 'variables': { 'enable_wexit_time_destructors': 1, }, 940 'variables': { 'enable_wexit_time_destructors': 1, },
940 'dependencies': [ 941 'dependencies': [
941 '../base/base.gyp:base', 942 '../base/base.gyp:base',
942 ], 943 ],
943 'sources': [ 944 'sources': [
944 'base/breakpad.h', 945 'base/breakpad.h',
945 'base/breakpad_linux.cc', 946 'base/breakpad_linux.cc',
946 'base/breakpad_mac.mm', 947 'base/breakpad_mac.mm',
947 'base/breakpad_win.cc', 948 'base/breakpad_win.cc',
949 'host/constants.h',
950 'host/constants_win.cc',
948 ], 951 ],
949 'conditions': [ 952 'conditions': [
950 ['OS=="win"', { 953 ['OS=="win"', {
951 'dependencies': [ 954 'dependencies': [
952 '../breakpad/breakpad.gyp:breakpad_handler', 955 '../breakpad/breakpad.gyp:breakpad_handler',
953 ], 956 ],
954 }], 957 }],
955 ], 958 ],
956 }, # end of target 'remoting_breakpad' 959 }, # end of target 'remoting_breakpad'
957 960
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
1075 'host/plugin/daemon_controller_win.cc', 1078 'host/plugin/daemon_controller_win.cc',
1076 'host/plugin/daemon_installer_win.cc', 1079 'host/plugin/daemon_installer_win.cc',
1077 'host/plugin/daemon_installer_win.h', 1080 'host/plugin/daemon_installer_win.h',
1078 'host/plugin/host_log_handler.cc', 1081 'host/plugin/host_log_handler.cc',
1079 'host/plugin/host_log_handler.h', 1082 'host/plugin/host_log_handler.h',
1080 'host/plugin/host_plugin.cc', 1083 'host/plugin/host_plugin.cc',
1081 'host/plugin/host_plugin_utils.cc', 1084 'host/plugin/host_plugin_utils.cc',
1082 'host/plugin/host_plugin_utils.h', 1085 'host/plugin/host_plugin_utils.h',
1083 'host/plugin/host_script_object.cc', 1086 'host/plugin/host_script_object.cc',
1084 'host/plugin/host_script_object.h', 1087 'host/plugin/host_script_object.h',
1085 'host/win/omaha.cc',
1086 'host/win/omaha.h',
1087 ], 1088 ],
1088 'conditions': [ 1089 'conditions': [
1089 ['OS=="mac"', { 1090 ['OS=="mac"', {
1090 'mac_bundle': 1, 1091 'mac_bundle': 1,
1091 'xcode_settings': { 1092 'xcode_settings': {
1092 'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)', 1093 'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)',
1093 'INFOPLIST_FILE': 'host/plugin/host_plugin-Info.plist', 1094 'INFOPLIST_FILE': 'host/plugin/host_plugin-Info.plist',
1094 'INFOPLIST_PREPROCESS': 'YES', 1095 'INFOPLIST_PREPROCESS': 'YES',
1095 # TODO(maruel): Use INFOPLIST_PREFIX_HEADER to remove the need to 1096 # TODO(maruel): Use INFOPLIST_PREFIX_HEADER to remove the need to
1096 # duplicate string once 1097 # duplicate string once
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
1335 'host/chromoting_host.cc', 1336 'host/chromoting_host.cc',
1336 'host/chromoting_host.h', 1337 'host/chromoting_host.h',
1337 'host/chromoting_host_context.cc', 1338 'host/chromoting_host_context.cc',
1338 'host/chromoting_host_context.h', 1339 'host/chromoting_host_context.h',
1339 'host/client_session.cc', 1340 'host/client_session.cc',
1340 'host/client_session.h', 1341 'host/client_session.h',
1341 'host/clipboard.h', 1342 'host/clipboard.h',
1342 'host/clipboard_linux.cc', 1343 'host/clipboard_linux.cc',
1343 'host/clipboard_mac.mm', 1344 'host/clipboard_mac.mm',
1344 'host/clipboard_win.cc', 1345 'host/clipboard_win.cc',
1346 'host/constants.h',
1345 'host/constants_mac.cc', 1347 'host/constants_mac.cc',
1346 'host/constants_mac.h', 1348 'host/constants_mac.h',
1349 'host/constants_win.cc',
1347 'host/continue_window.h', 1350 'host/continue_window.h',
1348 'host/continue_window_gtk.cc', 1351 'host/continue_window_gtk.cc',
1349 'host/continue_window_mac.mm', 1352 'host/continue_window_mac.mm',
1350 'host/continue_window_win.cc', 1353 'host/continue_window_win.cc',
1351 'host/desktop_environment.cc', 1354 'host/desktop_environment.cc',
1352 'host/desktop_environment.h', 1355 'host/desktop_environment.h',
1353 'host/desktop_environment_factory.cc', 1356 'host/desktop_environment_factory.cc',
1354 'host/desktop_environment_factory.h', 1357 'host/desktop_environment_factory.h',
1355 'host/differ.cc', 1358 'host/differ.cc',
1356 'host/differ.h', 1359 'host/differ.h',
1357 'host/disconnect_window.h', 1360 'host/disconnect_window.h',
1358 'host/disconnect_window_gtk.cc', 1361 'host/disconnect_window_gtk.cc',
1359 'host/disconnect_window_mac.h', 1362 'host/disconnect_window_mac.h',
1360 'host/disconnect_window_mac.mm', 1363 'host/disconnect_window_mac.mm',
1361 'host/disconnect_window_win.cc', 1364 'host/disconnect_window_win.cc',
1362 'host/dns_blackhole_checker.cc', 1365 'host/dns_blackhole_checker.cc',
1363 'host/dns_blackhole_checker.h', 1366 'host/dns_blackhole_checker.h',
1364 'host/event_executor.h', 1367 'host/event_executor.h',
1365 'host/event_executor_linux.cc', 1368 'host/event_executor_linux.cc',
1366 'host/event_executor_mac.cc', 1369 'host/event_executor_mac.cc',
1367 'host/event_executor_win.cc', 1370 'host/event_executor_win.cc',
1368 'host/gaia_oauth_client.cc', 1371 'host/gaia_oauth_client.cc',
1369 'host/gaia_oauth_client.h', 1372 'host/gaia_oauth_client.h',
1370 'host/heartbeat_sender.cc', 1373 'host/heartbeat_sender.cc',
1371 'host/heartbeat_sender.h', 1374 'host/heartbeat_sender.h',
1372 'host/host_config.cc', 1375 'host/host_config.cc',
1373 'host/host_config.h', 1376 'host/host_config.h',
1374 'host/host_exit_codes.h',
1375 'host/host_key_pair.cc', 1377 'host/host_key_pair.cc',
1376 'host/host_key_pair.h', 1378 'host/host_key_pair.h',
1377 'host/host_port_allocator.cc', 1379 'host/host_port_allocator.cc',
1378 'host/host_port_allocator.h', 1380 'host/host_port_allocator.h',
1379 'host/host_secret.cc', 1381 'host/host_secret.cc',
1380 'host/host_secret.h', 1382 'host/host_secret.h',
1381 'host/host_status_observer.h', 1383 'host/host_status_observer.h',
1382 'host/host_user_interface.cc', 1384 'host/host_user_interface.cc',
1383 'host/host_user_interface.h', 1385 'host/host_user_interface.h',
1384 'host/in_memory_host_config.cc', 1386 'host/in_memory_host_config.cc',
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
1437 'host/video_frame_capturer_fake.h', 1439 'host/video_frame_capturer_fake.h',
1438 'host/video_frame_capturer_helper.cc', 1440 'host/video_frame_capturer_helper.cc',
1439 'host/video_frame_capturer_helper.h', 1441 'host/video_frame_capturer_helper.h',
1440 'host/video_frame_capturer_linux.cc', 1442 'host/video_frame_capturer_linux.cc',
1441 'host/video_frame_capturer_mac.mm', 1443 'host/video_frame_capturer_mac.mm',
1442 'host/video_frame_capturer_win.cc', 1444 'host/video_frame_capturer_win.cc',
1443 'host/vlog_net_log.cc', 1445 'host/vlog_net_log.cc',
1444 'host/vlog_net_log.h', 1446 'host/vlog_net_log.h',
1445 'host/win/desktop.cc', 1447 'host/win/desktop.cc',
1446 'host/win/desktop.h', 1448 'host/win/desktop.h',
1447 'host/win/omaha.cc',
1448 'host/win/omaha.h',
1449 'host/win/scoped_thread_desktop.cc', 1449 'host/win/scoped_thread_desktop.cc',
1450 'host/win/scoped_thread_desktop.h', 1450 'host/win/scoped_thread_desktop.h',
1451 'host/win/session_desktop_environment_factory.cc', 1451 'host/win/session_desktop_environment_factory.cc',
1452 'host/win/session_desktop_environment_factory.h', 1452 'host/win/session_desktop_environment_factory.h',
1453 'host/win/session_event_executor.cc', 1453 'host/win/session_event_executor.cc',
1454 'host/win/session_event_executor.h', 1454 'host/win/session_event_executor.h',
1455 'host/x_server_pixel_buffer.cc', 1455 'host/x_server_pixel_buffer.cc',
1456 'host/x_server_pixel_buffer.h', 1456 'host/x_server_pixel_buffer.h',
1457 ], 1457 ],
1458 'conditions': [ 1458 'conditions': [
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
1990 '../base/allocator/allocator.gyp:allocator', 1990 '../base/allocator/allocator.gyp:allocator',
1991 ], 1991 ],
1992 }, 1992 },
1993 ], 1993 ],
1994 ], 1994 ],
1995 }], 1995 }],
1996 ], # end of 'conditions' 1996 ], # end of 'conditions'
1997 }, # end of target 'remoting_unittests' 1997 }, # end of target 'remoting_unittests'
1998 ], # end of targets 1998 ], # end of targets
1999 } 1999 }
OLDNEW
« no previous file with comments | « remoting/host/win/wts_session_process_launcher.cc ('k') | remoting/tools/me2me_virtual_host.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698