[sync] Componentize sync: Part Final: Target 'sync' is now its own component

sync/sync.gyp

Index: sync/sync.gyp
diff --git a/sync/sync.gyp b/sync/sync.gyp
index 5655343cef4fe58bb31606248606c7121e434ef5..9bd3926b3232e8cc8e683b0467cc5e10fcc999f5 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2012 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.
 
@@ -209,6 +209,9 @@
       'include_dirs': [
         '..',
       ],
+      'defines': [
+        'SYNC_IMPLEMENTATION',
+      ],
       'dependencies': [
         '../base/base.gyp:base',
         '../jingle/jingle.gyp:jingle_glue',
@@ -221,6 +224,7 @@
       'export_dependent_settings': [
         '../jingle/jingle.gyp:notifier',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+        'sync_core',
       ],
       'sources': [
         'notifier/invalidation_handler.h',
@@ -272,6 +276,7 @@
         }],
       ],
     },
+
     # The sync internal API library.
     {
       'target_name': 'sync_internal_api',
@@ -280,6 +285,9 @@
       'include_dirs': [
         '..',
       ],
+      'defines': [
+        'SYNC_IMPLEMENTATION',
+      ],
       'dependencies': [
         '../base/base.gyp:base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
@@ -293,6 +301,7 @@
         # files.
         'protocol/sync_proto.gyp:sync_proto',
         'sync_core',
+        'sync_notifier',
       ],
       'sources': [
         'internal_api/base_node.cc',
@@ -394,9 +403,18 @@
       'include_dirs': [
         '..',
       ],
+      'defines': [
+        'SYNC_IMPLEMENTATION',
+      ],
       'dependencies': [
         '../base/base.gyp:base',
         'protocol/sync_proto.gyp:sync_proto',
+        'sync_core',
+        'sync_internal_api',
+      ],
+      'export_dependent_settings': [
+        'protocol/sync_proto.gyp:sync_proto',
+        'sync_core',
         'sync_internal_api',
       ],
       # We avoid including header files from sync_proto in our public
@@ -421,39 +439,32 @@
       ],
     },
 
-    # The componentized sync library.
+    # The public sync target.
     {
-      'target_name': 'sync_component',
-      # TODO(rsimha): Change the type of this target to '<(component)' after
-      # exporting dependencies on 'sync_proto'.
-      'type': 'none',
+      'target_name': 'sync',
+      'type': '<(component)',
+      'variables': { 'enable_wexit_time_destructors': 1, },
+      'defines': [
+        'SYNC_IMPLEMENTATION',

[Ryan Sleevi, 2012/12/07 03:16:31]

This doesn't compile any sources. Why add this?

[Raghu Simha, 2012/12/07 06:08:33]

Removed.

+      ],
       'dependencies': [
+        'protocol/sync_proto.gyp:sync_proto',

[Ryan Sleevi, 2012/12/07 03:16:31]

Why did you add this bit? Seems a bit overkill.

[Raghu Simha, 2012/12/07 06:08:33]

I was under the wrong impression that 'sync' needed to re-export 'sync_proto'.
You're right -- this is overkill. Removed.

         'sync_api',
         'sync_core',
-        'sync_notifier',
         'sync_internal_api',
+        'sync_notifier',
       ],
       'export_dependent_settings': [
+        'protocol/sync_proto.gyp:sync_proto',
         'sync_api',
         'sync_core',
-        'sync_notifier',
         'sync_internal_api',
+        'sync_notifier',
       ],
-    },
-
-    # The public sync target.  This depends on 'sync_component' and
-    # 'sync_proto' separately since 'sync_proto' isn't exportable from
-    # 'sync_component' (for now).
-    {
-      'target_name': 'sync',
-      'type': 'none',
-      'dependencies': [
-        'sync_component',
-        'protocol/sync_proto.gyp:sync_proto',
-      ],
-      'export_dependent_settings': [
-        'sync_component',
-        'protocol/sync_proto.gyp:sync_proto',
+      'sources': [
+        # gyp requires at least one dummy file under 'sources'.
+        # TODO(rsimha): Remove this once crbug.com/163033 is fixed.
+        'dummy.cc',

[Ryan Sleevi, 2012/12/07 03:16:31]

So the MSVC issue I was mentioning is that MSVC will optimize out unreferenced
static initializers from static libraries that it decides are unreachable from
the shared library.

Luckily, you shouldn't be using static initializers, but I can't remember if we
got all of the protobuf ones eliminated. Just something to watch out for.

[Raghu Simha, 2012/12/07 06:08:33]

SGTM.

       ],
     },
 
@@ -529,12 +540,14 @@
       'dependencies': [
         '../testing/gmock.gyp:gmock',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
+        'sync_core',
         'sync_internal_api',
         'sync_notifier',
       ],
       'export_dependent_settings': [
         '../testing/gmock.gyp:gmock',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
+        'sync_core',
         'sync_internal_api',
         'sync_notifier',
       ],
@@ -896,7 +909,7 @@
       'variables': { 'enable_wexit_time_destructors': 0, },
       'dependencies': [
         '../base/base.gyp:run_all_unittests',
-        'sync',
+        'sync_api',
         'sync_api_tests',
         'sync_core_tests',
         'sync_internal_api_tests',
@@ -950,7 +963,8 @@
             '../jingle/jingle.gyp:notifier',
             '../net/net.gyp:net',
             '../net/net.gyp:net_test_support',
-            'sync',
+            'sync_internal_api',
+            'sync_notifier',
             'sync_tools_helper',
           ],
           'sources': [
@@ -970,8 +984,11 @@
             '../jingle/jingle.gyp:notifier',
             '../net/net.gyp:net',
             '../net/net.gyp:net_test_support',
-            'sync',
+            'sync_core',
+            'sync_internal_api',
+            'sync_notifier',
             'sync_tools_helper',
+            'test_support_sync_core'
           ],
           'sources': [
             'tools/sync_client.cc',