Break some parts of remoting.gyp into separate .gypi files.

Break some parts of remoting.gyp into separate .gypi files.

BUG=
R=sergeyu@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=247763

[Sergey Ulanov, 2014-01-28 23:35:54]

lgtm

https://codereview.chromium.org/139283010/diff/90001/remoting/remoting_client...
File remoting/remoting_client.gypi (right):

https://codereview.chromium.org/139283010/diff/90001/remoting/remoting_client...
remoting/remoting_client.gypi:7: 'remoting_locales': [
This is not used in this file and it's not client-specific. Keep it in
remoting.gyp?

[commit-bot: I haz the power, 2014-01-29 01:55:37]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/garykac@chromium.org/139283010/90001

[commit-bot: I haz the power, 2014-01-29 01:55:41]

Failed to apply patch for remoting/remoting.gyp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file remoting/remoting.gyp
  Hunk #3 FAILED at 118.
  Hunk #4 succeeded at 1797 (offset 1 line).
  Hunk #5 succeeded at 2099 (offset 1 line).
  Hunk #6 succeeded at 2236 (offset 1 line).
  1 out of 6 hunks FAILED -- saving rejects to file remoting/remoting.gyp.rej

Patch:       remoting/remoting.gyp
Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index
117b4356d08c2fbf93703f6dcb8e9e1617a3036e..e508011ace3c7997f9544aadefd5f8589ab76295
100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -29,12 +29,6 @@
     'host_plugin_mime_type': 'application/vnd.chromium.remoting-host',
 
     'conditions': [
-      # Remoting host is supported only on Windows, OSX and Linux (with X11).
-      ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0 and
use_x11==1)', {
-        'enable_remoting_host': 1,
-      }, {
-        'enable_remoting_host': 0,
-      }],
       ['OS=="mac"', {
         'mac_bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t
"@MAC_BUNDLE_ID@")',
         'mac_creator': '<!(python <(version_py_path) -f <(branding_path) -t
"@MAC_CREATOR@")',
@@ -74,58 +68,16 @@
             '<!(python -c "import uuid; print uuid.uuid4()" 2)',
       }],
     ],
-
-    'remoting_locales': [
-      'ar', 'bg', 'ca', 'cs', 'da', 'de', 'el', 'en', 'en-GB', 'es',
-      'es-419', 'et', 'fi', 'fil', 'fr', 'he', 'hi', 'hr', 'hu', 'id',
-      'it', 'ja', 'ko', 'lt', 'lv', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT',
-      'ro', 'ru', 'sk', 'sl', 'sr', 'sv', 'th', 'tr', 'uk', 'vi',
-      'zh-CN', 'zh-TW',
-    ],
-    'remoting_locale_files': [
-      # Build the list of .pak files generated from remoting_strings.grd.
-      '<!@pymod_do_main(remoting_copy_locales -o -p <(OS) -x '
-          '<(PRODUCT_DIR) <(remoting_locales))',
-    ],
-    'remoting_webapp_locale_files': [
-      # Build the list of .json files generated from remoting_strings.grd.
-      '<!@pymod_do_main(remoting_localize --locale_output '
-          '"<(webapp_locale_dir)/@{json_suffix}/messages.json" '
-          '--print_only <(remoting_locales))',
-    ],
-    'remoting_host_installer_mac_roots': [
-      'host/installer/mac/',
-      '<(DEPTH)/chrome/installer/mac/',
-    ],
-    'remoting_host_installer_mac_files': [
-      'host/installer/mac/do_signing.sh',
-      'host/installer/mac/do_signing.props',
-      'host/installer/mac/ChromotingHost.pkgproj',
-      'host/installer/mac/ChromotingHostService.pkgproj',
-      'host/installer/mac/ChromotingHostUninstaller.pkgproj',
-      'host/installer/mac/LaunchAgents/org.chromium.chromoting.plist',
-     
'host/installer/mac/PrivilegedHelperTools/org.chromium.chromoting.me2me.sh',
-      'host/installer/mac/Config/org.chromium.chromoting.conf',
-      'host/installer/mac/Scripts/keystone_install.sh',
-      'host/installer/mac/Scripts/remoting_postflight.sh',
-      'host/installer/mac/Scripts/remoting_preflight.sh',
-      'host/installer/mac/Keystone/GoogleSoftwareUpdate.pkg',
-      '<(DEPTH)/chrome/installer/mac/pkg-dmg',
-    ],
-    'remoting_host_installer_win_roots': [
-      'host/installer/win/',
-    ],
-    'remoting_host_installer_win_files': [
-      'host/installer/win/chromoting.wxs',
-      'host/installer/win/parameters.json',
-    ],
   },
 
   'includes': [
     '../chrome/js_unittest_vars.gypi',
     'remoting_android.gypi',
-    'remoting_webapp.gypi',
+    'remoting_client.gypi',
+    'remoting_host.gypi',
+    'remoting_test.gypi',
     'remoting_version.gypi',
+    'remoting_webapp_files.gypi',
   ],
 
   'target_defaults': {
@@ -166,1656 +118,6 @@
     ],
   },
 
-  'conditions': [
-    ['enable_remoting_host==1', {
-      'targets': [
-        {
-          'target_name': 'remoting_host',
-          'type': 'static_library',
-          'variables': { 'enable_wexit_time_destructors': 1, },
-          'dependencies': [
-            'remoting_base',
-            'remoting_protocol',
-            'remoting_resources',
-            '../crypto/crypto.gyp:crypto',
-            '../google_apis/google_apis.gyp:google_apis',
-            '../ipc/ipc.gyp:ipc',
-            '../third_party/webrtc/modules/modules.gyp:desktop_capture',
-            '../ui/events/events.gyp:dom4_keycode_converter',
-          ],
-          'defines': [
-            'VERSION=<(version_full)',
-          ],
-          'sources': [
-            'host/audio_capturer.cc',
-            'host/audio_capturer.h',
-            'host/audio_capturer_linux.cc',
-            'host/audio_capturer_linux.h',
-            'host/audio_capturer_mac.cc',
-            'host/audio_capturer_win.cc',
-            'host/audio_capturer_win.h',
-            'host/audio_scheduler.cc',
-            'host/audio_scheduler.h',
-            'host/audio_silence_detector.cc',
-            'host/audio_silence_detector.h',
-            'host/basic_desktop_environment.cc',
-            'host/basic_desktop_environment.h',
-            'host/branding.cc',
-            'host/branding.h',
-            'host/capture_scheduler.cc',
-            'host/capture_scheduler.h',
-            'host/chromoting_host.cc',
-            'host/chromoting_host.h',
-            'host/chromoting_host_context.cc',
-            'host/chromoting_host_context.h',
-            'host/chromoting_messages.cc',
-            'host/chromoting_messages.h',
-            'host/chromoting_param_traits.cc',
-            'host/chromoting_param_traits.h',
-            'host/client_session.cc',
-            'host/client_session.h',
-            'host/client_session_control.h',
-            'host/clipboard.h',
-            'host/clipboard_mac.mm',
-            'host/clipboard_win.cc',
-            'host/clipboard_x11.cc',
-            'host/config_file_watcher.cc',
-            'host/config_file_watcher.h',
-            'host/config_watcher.h',
-            'host/constants_mac.cc',
-            'host/constants_mac.h',
-            'host/continue_window.cc',
-            'host/continue_window.h',
-            'host/continue_window_aura.cc',
-            'host/continue_window_gtk.cc',
-            'host/continue_window_mac.mm',
-            'host/continue_window_win.cc',
-            'host/daemon_process.cc',
-            'host/daemon_process.h',
-            'host/daemon_process_win.cc',
-            'host/desktop_environment.h',
-            'host/desktop_process.cc',
-            'host/desktop_process.h',
-            'host/desktop_resizer.h',
-            'host/desktop_resizer_linux.cc',
-            'host/desktop_session.cc',
-            'host/desktop_session.h',
-            'host/desktop_session_agent.cc',
-            'host/desktop_session_agent.h',
-            'host/desktop_session_win.cc',
-            'host/desktop_session_win.h',
-            'host/desktop_resizer_mac.cc',
-            'host/desktop_resizer_win.cc',
-            'host/desktop_session_connector.h',
-            'host/desktop_session_proxy.cc',
-            'host/desktop_session_proxy.h',
-            'host/desktop_shape_tracker.h',
-            'host/desktop_shape_tracker_mac.cc',
-            'host/desktop_shape_tracker_win.cc',
-            'host/desktop_shape_tracker_x11.cc',
-            'host/disconnect_window_aura.cc',
-            'host/disconnect_window_gtk.cc',
-            'host/disconnect_window_mac.h',
-            'host/disconnect_window_mac.mm',
-            'host/disconnect_window_win.cc',
-            'host/dns_blackhole_checker.cc',
-            'host/dns_blackhole_checker.h',
-            'host/heartbeat_sender.cc',
-            'host/heartbeat_sender.h',
-            'host/host_change_notification_listener.cc',
-            'host/host_change_notification_listener.h',
-            'host/host_config.cc',
-            'host/host_config.h',
-            'host/host_event_logger.h',
-            'host/host_event_logger_posix.cc',
-            'host/host_event_logger_win.cc',
-            'host/host_exit_codes.cc',
-            'host/host_exit_codes.h',
-            'host/host_export.h',
-            'host/host_secret.cc',
-            'host/host_secret.h',
-            'host/host_status_monitor.h',
-            'host/host_status_observer.h',
-            'host/host_status_sender.cc',
-            'host/host_status_sender.h',
-            'host/host_window.h',
-            'host/host_window_proxy.cc',
-            'host/host_window_proxy.h',
-            'host/in_memory_host_config.cc',
-            'host/in_memory_host_config.h',
-            'host/input_injector.h',
-            'host/input_injector_linux.cc',
-            'host/input_injector_mac.cc',
-            'host/input_injector_win.cc',
-            'host/ipc_audio_capturer.cc',
-            'host/ipc_audio_capturer.h',
-            'host/ipc_constants.cc',
-            'host/ipc_constants.h',
-            'host/ipc_desktop_environment.cc',
-            'host/ipc_desktop_environment.h',
-            'host/ipc_host_event_logger.cc',
-            'host/ipc_host_event_logger.h',
-            'host/ipc_input_injector.cc',
-            'host/ipc_input_injector.h',
-            'host/ipc_screen_controls.cc',
-            'host/ipc_screen_controls.h',
-            'host/ipc_util.h',
-            'host/ipc_util_posix.cc',
-            'host/ipc_util_win.cc',
-            'host/ipc_video_frame_capturer.cc',
-            'host/ipc_video_frame_capturer.h',
-            'host/it2me_desktop_environment.cc',
-            'host/it2me_desktop_environment.h',
-            'host/json_host_config.cc',
-            'host/json_host_config.h',
-            'host/linux/audio_pipe_reader.cc',
-            'host/linux/audio_pipe_reader.h',
-            'host/linux/x11_util.cc',
-            'host/linux/x11_util.h',
-            'host/linux/x_server_clipboard.cc',
-            'host/linux/x_server_clipboard.h',
-            'host/local_input_monitor.h',
-     …
(message too large)

[garykac, 2014-01-29 02:15:50]

On 2014/01/28 23:35:54, Sergey Ulanov wrote:
> lgtm
> 
>
https://codereview.chromium.org/139283010/diff/90001/remoting/remoting_client...
> File remoting/remoting_client.gypi (right):
> 
>
https://codereview.chromium.org/139283010/diff/90001/remoting/remoting_client...
> remoting/remoting_client.gypi:7: 'remoting_locales': [
> This is not used in this file and it's not client-specific. Keep it in
> remoting.gyp?

Done.

[commit-bot: I haz the power, 2014-01-29 02:18:58]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/garykac@chromium.org/139283010/110001

[commit-bot: I haz the power, 2014-01-29 02:58:02]

Retried try job too often on mac_rel for step(s) remoting_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[commit-bot: I haz the power, 2014-01-29 19:46:37]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/garykac@chromium.org/139283010/110001

[garykac, 2014-01-29 22:41:52]

Committed patchset #7 manually as r247763 (presubmit successful).

[commit-bot: I haz the power, 2014-01-29 22:42:08]

CQ bit was unchecked on CL. Ignoring.

[Nico, 2014-03-17 17:45:08]

https://codereview.chromium.org/139283010/diff/110001/remoting/remoting_host....
File remoting/remoting_host.gypi (right):

https://codereview.chromium.org/139283010/diff/110001/remoting/remoting_host....
remoting/remoting_host.gypi:325: 'inputs': [ '<(RULE_INPUT_PATH)' ],
RULE_INPUT_PATH always is an input of a rule. This line does nothing. (And the
gyp spec doesn't guarantee that the RULE_INPUT_ variables even exist for the
inputs list.) Can you remove this, please?

[Nico, 2014-03-17 17:47:57]

https://codereview.chromium.org/139283010/diff/110001/remoting/remoting_host_...
File remoting/remoting_host_win.gypi (right):

https://codereview.chromium.org/139283010/diff/110001/remoting/remoting_host_...
remoting/remoting_host_win.gypi:394: '<(RULE_INPUT_PATH)',
Here too (and maybe elsewhere, like in the _mac version etc. Please remove all
RULE_INPUT_PATHs explicitly listed in inputs sections that you can find in
remoting)

[garykac, 2014-03-17 22:30:44]

On 2014/03/17 17:47:57, Nico (on GMT time Mar 15 - 24) wrote:
>
https://codereview.chromium.org/139283010/diff/110001/remoting/remoting_host_...
> File remoting/remoting_host_win.gypi (right):
> 
>
https://codereview.chromium.org/139283010/diff/110001/remoting/remoting_host_...
> remoting/remoting_host_win.gypi:394: '<(RULE_INPUT_PATH)',
> Here too (and maybe elsewhere, like in the _mac version etc. Please remove all
> RULE_INPUT_PATHs explicitly listed in inputs sections that you can find in
> remoting)

https://codereview.chromium.org/197233010