sync: Separate .gyp file for standalone tools

Moves targets related to the standalone executables
sync_listen_notifications and sync_client into their own .gyp file.

This will prevent a temporary circular dependency as we attempt to
invert the dependency from components/invalidation -> sync towards
sync -> components/invalidation.

BUG=378024

Review URL: https://codereview.chromium.org/303603004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273665 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 75 insertions, 64 deletions

diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi
index 28782eb..df762d8 100644
--- a/sync/sync_tests.gypi
+++ b/sync/sync_tests.gypi
@@ -571,29 +571,6 @@
   'conditions': [
     ['OS != "ios"', {
       'targets': [
-        {
-          'target_name': 'sync_tools_helper',
-          'type': 'static_library',
-          'defines': [
-            'SYNC_IMPLEMENTATION',
-          ],
-          'include_dirs': [
-            '..',
-          ],
-          'dependencies': [
-            '../base/base.gyp:base',
-            'sync',
-          ],
-          'export_dependent_settings': [
-            '../base/base.gyp:base',
-            'sync',
-          ],
-          'sources': [
-            'tools/null_invalidation_state_tracker.cc',
-            'tools/null_invalidation_state_tracker.h',
-          ],
-        },
-
         # A tool that can be used to launch a python sync server instance.
         {
           'target_name': 'run_sync_testserver',
@@ -609,47 +586,6 @@
             'tools/testserver/run_sync_testserver.cc',
           ],
         },
-
-        # A tool to listen to sync notifications and print them out.
-        {
-          'target_name': 'sync_listen_notifications',
-          'type': 'executable',
-          'defines': [
-            'SYNC_TEST',
-          ],
-          'dependencies': [
-            '../base/base.gyp:base',
-            '../jingle/jingle.gyp:notifier',
-            '../net/net.gyp:net',
-            '../net/net.gyp:net_test_support',
-            'sync',
-            'sync_tools_helper',
-          ],
-          'sources': [
-            'tools/sync_listen_notifications.cc',
-          ],
-        },
-
-        # A standalone command-line sync client.
-        {
-          'target_name': 'sync_client',
-          'type': 'executable',
-          'defines': [
-            'SYNC_TEST',
-          ],
-          'dependencies': [
-            '../base/base.gyp:base',
-            '../jingle/jingle.gyp:notifier',
-            '../net/net.gyp:net',
-            '../net/net.gyp:net_test_support',
-            'sync',
-            'sync_tools_helper',
-            'test_support_sync_core'
-          ],
-          'sources': [
-            'tools/sync_client.cc',
-          ],
-        },
       ],
     }],
     ['OS == "android"', {
diff --git a/sync/tools/sync_tools.gyp b/sync/tools/sync_tools.gyp
new file mode 100644
index 0000000..7cc8352
--- /dev/null
+++ b/sync/tools/sync_tools.gyp
@@ -0,0 +1,75 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'variables': {
+    'chromium_code': 1,
+  },
+
+  'targets': [
+  {
+    'target_name': 'sync_tools_helper',
+    'type': 'static_library',
+    'defines': [
+      'SYNC_IMPLEMENTATION',
+    ],
+    'include_dirs': [
+      '../..',
+    ],
+    'dependencies': [
+      '../../base/base.gyp:base',
+      '../sync.gyp:sync',
+    ],
+    'export_dependent_settings': [
+      '../../base/base.gyp:base',
+      '../sync.gyp:sync',
+    ],
+    'sources': [
+      'null_invalidation_state_tracker.cc',
+      'null_invalidation_state_tracker.h',
+    ],
+  },
+  # A tool to listen to sync notifications and print them out.
+  {
+    'target_name': 'sync_listen_notifications',
+    'type': 'executable',
+    'defines': [
+      'SYNC_TEST',
+    ],
+    'dependencies': [
+      '../../base/base.gyp:base',
+      '../../jingle/jingle.gyp:notifier',
+      '../../net/net.gyp:net',
+      '../../net/net.gyp:net_test_support',
+      '../sync.gyp:sync',
+      'sync_tools_helper',
+    ],
+    'sources': [
+      'sync_listen_notifications.cc',
+    ],
+  },
+
+  # A standalone command-line sync client.
+  {
+    'target_name': 'sync_client',
+    'type': 'executable',
+    'defines': [
+      'SYNC_TEST',
+    ],
+    'dependencies': [
+      '../../base/base.gyp:base',
+      '../../jingle/jingle.gyp:notifier',
+      '../../net/net.gyp:net',
+      '../../net/net.gyp:net_test_support',
+      '../sync.gyp:sync',
+      '../sync.gyp:test_support_sync_core',
+      'sync_tools_helper',
+    ],
+    'sources': [
+      'sync_client.cc',
+    ],
+  },
+  ]
+}
+