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

sync/sync.gyp

-# 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     # The core sync library.
     {
@@ skipping 190 matching lines @@
     },
 
     # The sync notifications library.
     {
       'target_name': 'sync_notifier',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'include_dirs': [
         '..',
       ],
+      'defines': [
+        'SYNC_IMPLEMENTATION',
+      ],
       'dependencies': [
         '../base/base.gyp:base',
         '../jingle/jingle.gyp:jingle_glue',
         '../jingle/jingle.gyp:notifier',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         # TODO(akalin): Remove this (http://crbug.com/133352).
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
         'sync_core',
       ],
       'export_dependent_settings': [
         '../jingle/jingle.gyp:notifier',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+        'sync_core',
       ],
       'sources': [
         'notifier/invalidation_handler.h',
         'notifier/invalidation_state_tracker.cc',
         'notifier/invalidation_state_tracker.h',
         'notifier/invalidation_util.cc',
         'notifier/invalidation_util.h',
         'notifier/invalidator_factory.cc',
         'notifier/invalidator_factory.h',
         'notifier/invalidator.h',
@@ skipping 31 matching lines @@
             'notifier/sync_system_resources.h',
           ],
         }],
         ['OS != "ios"', {
           'dependencies': [
             '../third_party/libjingle/libjingle.gyp:libjingle',
           ],
         }],
       ],
     },
+
     # The sync internal API library.
     {
       'target_name': 'sync_internal_api',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'include_dirs': [
         '..',
       ],
+      'defines': [
+        'SYNC_IMPLEMENTATION',
+      ],
       'dependencies': [
         '../base/base.gyp:base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../net/net.gyp:net',
         'protocol/sync_proto.gyp:sync_proto',
         'sync_core',
         'sync_notifier',
       ],
       'export_dependent_settings': [
         # Propagate sync_proto since our headers include its generated
         # files.
         'protocol/sync_proto.gyp:sync_proto',
         'sync_core',
+        'sync_notifier',
       ],
       'sources': [
         'internal_api/base_node.cc',
         'internal_api/base_transaction.cc',
         'internal_api/change_record.cc',
         'internal_api/change_reorder_buffer.cc',
         'internal_api/change_reorder_buffer.h',
         'internal_api/debug_info_event_listener.cc',
         'internal_api/debug_info_event_listener.h',
         'internal_api/http_bridge.cc',
@@ skipping 81 matching lines @@
     },
 
     # The sync external API library.
     {
       'target_name': 'sync_api',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       '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
       # header files so we don't need to export its settings.
       'sources': [
         'api/string_ordinal.h',
         'api/syncable_service.cc',
         'api/syncable_service.h',
         'api/sync_data.h',
         'api/sync_data.cc',
         'api/sync_change.h',
         'api/sync_change.cc',
         'api/sync_change_processor.h',
         'api/sync_change_processor.cc',
         'api/sync_error.h',
         'api/sync_error.cc',
         'api/sync_error_factory.h',
         'api/sync_error_factory.cc',
         'api/sync_merge_result.h',
         'api/sync_merge_result.cc',
         'api/time.h',
       ],
     },
 
-    # 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_internal_api',
         'sync_notifier',
-        'sync_internal_api',
       ],
       'export_dependent_settings': [
+        'protocol/sync_proto.gyp:sync_proto',
         'sync_api',
         'sync_core',
+        'sync_internal_api',
         'sync_notifier',
-        'sync_internal_api',
+      ],
+      '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.

       ],
     },
 
-    # 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',
-      ],
-    },
-
     # Test support files for the 'sync_core' target.
     {
       'target_name': 'test_support_sync_core',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'include_dirs': [
         '..',
       ],
       'dependencies': [
         '../base/base.gyp:base',
@@ skipping 52 matching lines @@
     # Test support files for the 'sync_notifier' target.
     {
       'target_name': 'test_support_sync_notifier',
       'type': 'static_library',
       'include_dirs': [
         '..',
       ],
       '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',
       ],
       'sources': [
         'notifier/fake_invalidation_state_tracker.cc',
         'notifier/fake_invalidation_state_tracker.h',
         'notifier/fake_invalidator.cc',
         'notifier/fake_invalidator.h',
         'notifier/fake_invalidation_handler.cc',
         'notifier/fake_invalidation_handler.h',
@@ skipping 341 matching lines @@
     },
 
     # The unit test executable for sync tests.
     {
       'target_name': 'sync_unit_tests',
       'type': '<(gtest_target_type)',
       # Typed-parametrized tests generate exit-time destructors.
       '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',
         'sync_notifier_tests',
       ],
       'conditions': [
         # TODO(akalin): This is needed because histogram.cc uses
         # leak_annotations.h, which pulls this in.  Make 'base'
         # propagate this dependency.
         ['OS=="linux" and linux_use_tcmalloc==1', {
@@ skipping 33 matching lines @@
         },
         # A tool to listen to sync notifications and print them out.
         {
           'target_name': 'sync_listen_notifications',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             '../jingle/jingle.gyp:notifier',
             '../net/net.gyp:net',
             '../net/net.gyp:net_test_support',
-            'sync',
+            'sync_internal_api',
+            'sync_notifier',
             '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_core',
+            'sync_internal_api',
+            'sync_notifier',
             'sync_tools_helper',
+            'test_support_sync_core'
           ],
           'sources': [
             'tools/sync_client.cc',
           ],
         },
       ],
     }],
 
     # Special target to wrap a gtest_target_type==shared_library
     # sync_unit_tests into an android apk for execution.
     ['OS == "android" and gtest_target_type == "shared_library"', {
       'targets': [
         {
           'target_name': 'sync_unit_tests_apk',
           'type': 'none',
           'dependencies': [
             'sync_unit_tests',
           ],
           'variables': {
             'test_suite_name': 'sync_unit_tests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sync_unit_tests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }