[Sync] Clean up sync.gyp

sync/sync.gyp

 # Copyright (c) 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 10 matching lines @@
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../crypto/crypto.gyp:crypto',
         '../net/net.gyp:net',
         '../sql/sql.gyp:sql',
         'protocol/sync_proto.gyp:sync_proto',
       ],
       'export_dependent_settings': [
-        '../base/base.gyp:base',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
-        '../crypto/crypto.gyp:crypto',
-        '../net/net.gyp:net',
-        '../sql/sql.gyp:sql',
+        # Propagate sync_proto since our headers include its generated
+        # files.
         'protocol/sync_proto.gyp:sync_proto',
       ],
       'sources': [
         'engine/apply_updates_command.cc',
         'engine/apply_updates_command.h',
         'engine/build_commit_command.cc',
         'engine/build_commit_command.h',
         'engine/cleanup_disabled_types_command.cc',
         'engine/cleanup_disabled_types_command.h',
         'engine/clear_data_command.cc',
@@ skipping 141 matching lines @@
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'include_dirs': [
         '..',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         'sync',
+        'protocol/sync_proto.gyp:sync_proto',

[Ryan Sleevi, 2012/03/16 17:24:21]

nit: ordering

[akalin, 2012/03/16 19:22:56]

Done.

       ],
       'export_dependent_settings': [
-        '../base/base.gyp:base',
+        # Propagate sync and sync_proto, since our includes pick up
+        # generated files from both.
+        'sync',
+        'protocol/sync_proto.gyp:sync_proto',

[Ryan Sleevi, 2012/03/16 17:24:21]

nit: ordering

[akalin, 2012/03/16 19:22:56]

Done.

+        # propagate gmock, since our includes include its includes.

[Ryan Sleevi, 2012/03/16 17:24:21]

You don't need these comments - but they do reflect an understanding of when to
use e_d_s. Thanks :)

[akalin, 2012/03/16 19:22:56]

Done.

         '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
-        'sync',
       ],
       'sources': [
         'js/js_test_util.cc',
         'js/js_test_util.h',
         'sessions/test_util.cc',
         'sessions/test_util.h',
         'syncable/model_type_test_util.cc',
         'syncable/model_type_test_util.h',
         'syncable/syncable_mock.cc',
         'syncable/syncable_mock.h',
@@ skipping 30 matching lines @@
     # library because the unit test files have to be compiled directly
     # into the executable, so we push the target files to the
     # depending executable target via direct_dependent_settings.
     {
       'target_name': 'sync_tests',
       'type': 'none',
       # We only want unit test executables to include this target.
       'suppress_wildcard': 1,
       'dependencies': [
         '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        'protocol/sync_proto.gyp:sync_proto',

[Ryan Sleevi, 2012/03/16 17:24:21]

I'm not sure stylistically which is more appropriate, but you've got two
different sort orders here (compare with line 197-202)

Should parent directories appear first (as here in 252-257/262-267) or last. My
vote is last, but that's just me. It makes no difference GYP wise.

[akalin, 2012/03/16 19:22:56]

I think first is the more common style so I'll stick with that.

         'sync',
         'test_support_sync',
       ],
+      # Propagate all dependencies since the actual compilation
+      # happens in the dependents.
       'export_dependent_settings': [
         '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        'protocol/sync_proto.gyp:sync_proto',
         'sync',
         'test_support_sync',
       ],
       'direct_dependent_settings': {
         'variables': { 'enable_wexit_time_destructors': 1, },
         'include_dirs': [
           '..',
         ],
         'sources': [
           'engine/apply_updates_command_unittest.cc',
@@ skipping 50 matching lines @@
     #
     # TODO(akalin): Rename this to sync_unit_tests once we've moved
     # everything from chrome.gyp.
     #
     # TODO(akalin): Make base.gyp have a test_main target that
     # includes run_all_unittests.cc and the possible tcmalloc
     # dependency and use that everywhere.
     {
       'target_name': 'sync_unit_tests_canary',
       'type': 'executable',
+      'include_dirs': [
+        '..',
+      ],
+      'dependencies': [
+        '../base/base.gyp:test_support_base',
+        'sync_tests',
+      ],
       'sources': [
         '../base/test/run_all_unittests.cc',
       ],
-      'dependencies': [
-        'sync_tests',
-      ],
-
       # TODO(akalin): This is needed because histogram.cc uses
       # leak_annotations.h, which pulls this in.  Make 'base'
       # propagate this dependency.
       'conditions': [
         ['OS=="linux" and linux_use_tcmalloc==1', {
           'dependencies': [
             '../base/allocator/allocator.gyp:allocator',
           ],
         }],
       ],
     },
   ],
 }