| Index: remoting/host/BUILD.gn | 
| diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn | 
| index 5600e4db68c55a0555517dcf90f798053c36d5db..5d8be35d38f1e37be9bb4b35b4ed23df553081c5 100644 | 
| --- a/remoting/host/BUILD.gn | 
| +++ b/remoting/host/BUILD.gn | 
| @@ -10,7 +10,6 @@ import("//chrome/version.gni") | 
| import("//remoting/remoting_enable.gni") | 
| import("//remoting/remoting_locales.gni") | 
| import("//remoting/remoting_options.gni") | 
| -import("//remoting/remoting_srcs.gni") | 
| import("//remoting/remoting_version.gni") | 
| import("//remoting/tools/build/remoting_localize.gni") | 
|  | 
| @@ -92,9 +91,306 @@ action("credits") { | 
| # TODO fix this, successful builds should not depend on static libraries | 
| # stripping code. | 
| static_library("host") { | 
| -  sources = rebase_path(remoting_host_srcs_gypi_values.remoting_host_sources, | 
| -                        ".", | 
| -                        "//remoting") | 
| +  sources = [ | 
| +    "audio_capturer.cc", | 
| +    "audio_capturer.h", | 
| +    "audio_capturer_android.cc", | 
| +    "audio_capturer_linux.cc", | 
| +    "audio_capturer_linux.h", | 
| +    "audio_capturer_mac.cc", | 
| +    "audio_capturer_win.cc", | 
| +    "audio_capturer_win.h", | 
| +    "audio_pump.cc", | 
| +    "audio_pump.h", | 
| +    "audio_silence_detector.cc", | 
| +    "audio_silence_detector.h", | 
| +    "backoff_timer.cc", | 
| +    "backoff_timer.h", | 
| +    "basic_desktop_environment.cc", | 
| +    "basic_desktop_environment.h", | 
| +    "branding.cc", | 
| +    "branding.h", | 
| +    "chromeos/aura_desktop_capturer.cc", | 
| +    "chromeos/aura_desktop_capturer.h", | 
| +    "chromeos/clipboard_aura.cc", | 
| +    "chromeos/clipboard_aura.h", | 
| +    "chromeos/message_box.cc", | 
| +    "chromeos/message_box.h", | 
| +    "chromeos/mouse_cursor_monitor_aura.cc", | 
| +    "chromeos/mouse_cursor_monitor_aura.h", | 
| +    "chromeos/point_transformer.cc", | 
| +    "chromeos/point_transformer.h", | 
| +    "chromeos/skia_bitmap_desktop_frame.cc", | 
| +    "chromeos/skia_bitmap_desktop_frame.h", | 
| +    "chromoting_host.cc", | 
| +    "chromoting_host.h", | 
| +    "chromoting_host_context.cc", | 
| +    "chromoting_host_context.h", | 
| +    "chromoting_messages.cc", | 
| +    "chromoting_messages.h", | 
| +    "chromoting_param_traits.cc", | 
| +    "chromoting_param_traits.h", | 
| +    "client_session.cc", | 
| +    "client_session.h", | 
| +    "client_session_control.h", | 
| +    "client_session_details.h", | 
| +    "clipboard.h", | 
| +    "clipboard_mac.mm", | 
| +    "clipboard_win.cc", | 
| +    "clipboard_x11.cc", | 
| +    "config_file_watcher.cc", | 
| +    "config_file_watcher.h", | 
| +    "config_watcher.h", | 
| +    "constants_mac.cc", | 
| +    "constants_mac.h", | 
| +    "continue_window.cc", | 
| +    "continue_window.h", | 
| +    "continue_window_android.cc", | 
| +    "continue_window_chromeos.cc", | 
| +    "continue_window_linux.cc", | 
| +    "continue_window_mac.mm", | 
| +    "continue_window_win.cc", | 
| +    "curtain_mode.h", | 
| +    "curtain_mode_android.cc", | 
| +    "curtain_mode_linux.cc", | 
| +    "curtain_mode_mac.cc", | 
| +    "curtain_mode_win.cc", | 
| +    "daemon_process.cc", | 
| +    "daemon_process.h", | 
| +    "daemon_process_win.cc", | 
| +    "desktop_capturer_proxy.cc", | 
| +    "desktop_capturer_proxy.h", | 
| +    "desktop_environment.h", | 
| +    "desktop_process.cc", | 
| +    "desktop_process.h", | 
| +    "desktop_resizer.h", | 
| +    "desktop_resizer_android.cc", | 
| +    "desktop_resizer_mac.cc", | 
| +    "desktop_resizer_ozone.cc", | 
| +    "desktop_resizer_win.cc", | 
| +    "desktop_resizer_x11.cc", | 
| +    "desktop_session.cc", | 
| +    "desktop_session.h", | 
| +    "desktop_session_agent.cc", | 
| +    "desktop_session_agent.h", | 
| +    "desktop_session_connector.h", | 
| +    "desktop_session_proxy.cc", | 
| +    "desktop_session_proxy.h", | 
| +    "desktop_session_win.cc", | 
| +    "desktop_session_win.h", | 
| +    "disconnect_window_android.cc", | 
| +    "disconnect_window_chromeos.cc", | 
| +    "disconnect_window_linux.cc", | 
| +    "disconnect_window_mac.h", | 
| +    "disconnect_window_mac.mm", | 
| +    "disconnect_window_win.cc", | 
| +    "dns_blackhole_checker.cc", | 
| +    "dns_blackhole_checker.h", | 
| +    "gcd_rest_client.cc", | 
| +    "gcd_rest_client.h", | 
| +    "gcd_state_updater.cc", | 
| +    "gcd_state_updater.h", | 
| +    "heartbeat_sender.cc", | 
| +    "heartbeat_sender.h", | 
| +    "host_change_notification_listener.cc", | 
| +    "host_change_notification_listener.h", | 
| +    "host_config.cc", | 
| +    "host_config.h", | 
| +    "host_config_constants.cc", | 
| +    "host_details.cc", | 
| +    "host_details.h", | 
| +    "host_event_logger.h", | 
| +    "host_event_logger_posix.cc", | 
| +    "host_event_logger_win.cc", | 
| +    "host_exit_codes.cc", | 
| +    "host_exit_codes.h", | 
| +    "host_export.h", | 
| +    "host_extension.h", | 
| +    "host_extension_session.h", | 
| +    "host_extension_session_manager.cc", | 
| +    "host_extension_session_manager.h", | 
| +    "host_power_save_blocker.cc", | 
| +    "host_power_save_blocker.h", | 
| +    "host_secret.cc", | 
| +    "host_secret.h", | 
| +    "host_status_logger.cc", | 
| +    "host_status_logger.h", | 
| +    "host_status_monitor.h", | 
| +    "host_status_observer.h", | 
| +    "host_window.h", | 
| +    "host_window_proxy.cc", | 
| +    "host_window_proxy.h", | 
| +    "input_injector.h", | 
| +    "input_injector_android.cc", | 
| +    "input_injector_chromeos.cc", | 
| +    "input_injector_chromeos.h", | 
| +    "input_injector_mac.cc", | 
| +    "input_injector_win.cc", | 
| +    "input_injector_x11.cc", | 
| +    "ipc_audio_capturer.cc", | 
| +    "ipc_audio_capturer.h", | 
| +    "ipc_constants.cc", | 
| +    "ipc_constants.h", | 
| +    "ipc_desktop_environment.cc", | 
| +    "ipc_desktop_environment.h", | 
| +    "ipc_host_event_logger.cc", | 
| +    "ipc_host_event_logger.h", | 
| +    "ipc_input_injector.cc", | 
| +    "ipc_input_injector.h", | 
| +    "ipc_mouse_cursor_monitor.cc", | 
| +    "ipc_mouse_cursor_monitor.h", | 
| +    "ipc_screen_controls.cc", | 
| +    "ipc_screen_controls.h", | 
| +    "ipc_util.h", | 
| +    "ipc_util_posix.cc", | 
| +    "ipc_util_win.cc", | 
| +    "ipc_video_frame_capturer.cc", | 
| +    "ipc_video_frame_capturer.h", | 
| +    "it2me_desktop_environment.cc", | 
| +    "it2me_desktop_environment.h", | 
| +    "linux/audio_pipe_reader.cc", | 
| +    "linux/audio_pipe_reader.h", | 
| +    "linux/certificate_watcher.cc", | 
| +    "linux/certificate_watcher.h", | 
| +    "linux/unicode_to_keysym.cc", | 
| +    "linux/unicode_to_keysym.h", | 
| +    "linux/x11_util.cc", | 
| +    "linux/x11_util.h", | 
| +    "linux/x_server_clipboard.cc", | 
| +    "linux/x_server_clipboard.h", | 
| +    "local_input_monitor.h", | 
| +    "local_input_monitor_android.cc", | 
| +    "local_input_monitor_chromeos.cc", | 
| +    "local_input_monitor_mac.mm", | 
| +    "local_input_monitor_win.cc", | 
| +    "local_input_monitor_x11.cc", | 
| +    "logging.h", | 
| +    "logging_linux.cc", | 
| +    "logging_mac.cc", | 
| +    "logging_win.cc", | 
| +    "me2me_desktop_environment.cc", | 
| +    "me2me_desktop_environment.h", | 
| +    "mouse_cursor_monitor_proxy.cc", | 
| +    "mouse_cursor_monitor_proxy.h", | 
| +    "mouse_shape_pump.cc", | 
| +    "mouse_shape_pump.h", | 
| +    "oauth_token_getter.cc", | 
| +    "oauth_token_getter.h", | 
| +    "oauth_token_getter_impl.cc", | 
| +    "oauth_token_getter_impl.h", | 
| +    "pairing_registry_delegate.cc", | 
| +    "pairing_registry_delegate.h", | 
| +    "pairing_registry_delegate_android.cc", | 
| +    "pairing_registry_delegate_linux.cc", | 
| +    "pairing_registry_delegate_linux.h", | 
| +    "pairing_registry_delegate_mac.cc", | 
| +    "pairing_registry_delegate_win.cc", | 
| +    "pairing_registry_delegate_win.h", | 
| +    "pin_hash.cc", | 
| +    "pin_hash.h", | 
| +    "policy_watcher.cc", | 
| +    "policy_watcher.h", | 
| +    "posix/signal_handler.cc", | 
| +    "posix/signal_handler.h", | 
| +    "register_support_host_request.cc", | 
| +    "register_support_host_request.h", | 
| +    "remote_input_filter.cc", | 
| +    "remote_input_filter.h", | 
| +    "resizing_host_observer.cc", | 
| +    "resizing_host_observer.h", | 
| +    "resources.h", | 
| +    "resources_android.cc", | 
| +    "resources_linux.cc", | 
| +    "resources_mac.cc", | 
| +    "resources_win.cc", | 
| +    "sas_injector.h", | 
| +    "sas_injector_win.cc", | 
| +    "screen_controls.h", | 
| +    "screen_resolution.cc", | 
| +    "screen_resolution.h", | 
| +    "security_key/security_key_auth_handler.h", | 
| +    "security_key/security_key_auth_handler_posix.cc", | 
| +    "security_key/security_key_auth_handler_win.cc", | 
| +    "security_key/security_key_extension.cc", | 
| +    "security_key/security_key_extension.h", | 
| +    "security_key/security_key_extension_session.cc", | 
| +    "security_key/security_key_extension_session.h", | 
| +    "security_key/security_key_ipc_client.cc", | 
| +    "security_key/security_key_ipc_client.h", | 
| +    "security_key/security_key_ipc_constants.cc", | 
| +    "security_key/security_key_ipc_constants.h", | 
| +    "security_key/security_key_ipc_server.cc", | 
| +    "security_key/security_key_ipc_server.h", | 
| +    "security_key/security_key_ipc_server_impl.cc", | 
| +    "security_key/security_key_ipc_server_impl.h", | 
| +    "security_key/security_key_message.cc", | 
| +    "security_key/security_key_message.h", | 
| +    "security_key/security_key_message_handler.cc", | 
| +    "security_key/security_key_message_handler.h", | 
| +    "security_key/security_key_message_reader.h", | 
| +    "security_key/security_key_message_reader_impl.cc", | 
| +    "security_key/security_key_message_reader_impl.h", | 
| +    "security_key/security_key_message_writer.h", | 
| +    "security_key/security_key_message_writer_impl.cc", | 
| +    "security_key/security_key_message_writer_impl.h", | 
| +    "security_key/security_key_socket.cc", | 
| +    "security_key/security_key_socket.h", | 
| +    "server_log_entry_host.cc", | 
| +    "server_log_entry_host.h", | 
| +    "service_urls.cc", | 
| +    "service_urls.h", | 
| +    "shutdown_watchdog.cc", | 
| +    "shutdown_watchdog.h", | 
| +    "signaling_connector.cc", | 
| +    "signaling_connector.h", | 
| +    "single_window_desktop_environment.cc", | 
| +    "single_window_desktop_environment.h", | 
| +    "single_window_input_injector.h", | 
| +    "single_window_input_injector_linux.cc", | 
| +    "single_window_input_injector_mac.cc", | 
| +    "single_window_input_injector_win.cc", | 
| +    "switches.cc", | 
| +    "switches.h", | 
| +    "third_party_auth_config.cc", | 
| +    "third_party_auth_config.h", | 
| +    "token_validator_base.cc", | 
| +    "token_validator_base.h", | 
| +    "token_validator_factory_impl.cc", | 
| +    "token_validator_factory_impl.h", | 
| +    "touch_injector_win.cc", | 
| +    "touch_injector_win.h", | 
| +    "usage_stats_consent.h", | 
| +    "usage_stats_consent_mac.cc", | 
| +    "usage_stats_consent_win.cc", | 
| +    "username.cc", | 
| +    "username.h", | 
| +    "win/com_imported_mstscax.tlh", | 
| +    "win/com_security.cc", | 
| +    "win/com_security.h", | 
| +    "win/elevation_helpers.cc", | 
| +    "win/elevation_helpers.h", | 
| +    "win/launch_process_with_token.cc", | 
| +    "win/launch_process_with_token.h", | 
| +    "win/omaha.cc", | 
| +    "win/omaha.h", | 
| +    "win/rdp_client.cc", | 
| +    "win/rdp_client.h", | 
| +    "win/rdp_client_window.cc", | 
| +    "win/rdp_client_window.h", | 
| +    "win/security_descriptor.cc", | 
| +    "win/security_descriptor.h", | 
| +    "win/session_desktop_environment.cc", | 
| +    "win/session_desktop_environment.h", | 
| +    "win/session_input_injector.cc", | 
| +    "win/session_input_injector.h", | 
| +    "win/window_station_and_desktop.cc", | 
| +    "win/window_station_and_desktop.h", | 
| +    "win/worker_process_launcher.cc", | 
| +    "win/worker_process_launcher.h", | 
| +    "win/wts_terminal_monitor.cc", | 
| +    "win/wts_terminal_monitor.h", | 
| +    "win/wts_terminal_observer.h", | 
| +  ] | 
|  | 
| libs = [] | 
|  | 
| @@ -403,8 +699,8 @@ if (is_win) { | 
| # IDL file with the values. | 
| clsids = exec_script("win/get_clsids.py", | 
| [ | 
| -                         remoting_srcs_gypi_values.daemon_controller_guid, | 
| -                         remoting_srcs_gypi_values.rdp_desktop_session_guid, | 
| +                         daemon_controller_guid, | 
| +                         rdp_desktop_session_guid, | 
| chrome_version_full, | 
| ], | 
| "value") | 
|  |