[Sync] Clean up sync.gyp

sync/sync.gyp

Index: sync/sync.gyp
diff --git a/sync/sync.gyp b/sync/sync.gyp
index f355761348d9ba07a05b34d67b25a0fc2ba4c1f6..82eb09fae9e38f3e4fc1e3e9163d314c46453000 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -28,11 +28,8 @@
         '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': [
@@ -194,12 +191,15 @@
         '../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',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
+        # 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',
       ],
       'sources': [
         'js/js_test_util.cc',
@@ -250,17 +250,19 @@
       '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',
       ],
@@ -331,13 +333,16 @@
     {
       'target_name': 'sync_unit_tests_canary',
       'type': 'executable',
-      'sources': [
-        '../base/test/run_all_unittests.cc',
+      'include_dirs': [
+        '..',
       ],
       'dependencies': [
+        '../base/base.gyp:test_support_base',
         'sync_tests',
       ],
-
+      'sources': [
+        '../base/test/run_all_unittests.cc',
+      ],
       # TODO(akalin): This is needed because histogram.cc uses
       # leak_annotations.h, which pulls this in.  Make 'base'
       # propagate this dependency.