diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 18:31:59 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 18:31:59 +0000 |
| commit | e12d0a95af31e1029176afb1ddad5bc70820c208 (patch) | |
| tree | bd316da6967a5c76fc5f7168ae5b2855bb3f615c /sync | |
| parent | e83713478e414da7411b55849a3a2a2d64f04921 (diff) | |
| download | chromium_src-e12d0a95af31e1029176afb1ddad5bc70820c208.zip chromium_src-e12d0a95af31e1029176afb1ddad5bc70820c208.tar.gz chromium_src-e12d0a95af31e1029176afb1ddad5bc70820c208.tar.bz2 | |
[Sync] Clean up sync.gyp
Only export dependent settings when necessary.
Forward-declare crypto classes to avoid including crypto headers in
sync headers (and thus neccessitating exporting crypto settings to
dependents).
BUG=117585
TEST=
Review URL: http://codereview.chromium.org/9701094
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/sync.gyp | 17 | ||||
| -rw-r--r-- | sync/util/nigori.cc | 1 | ||||
| -rw-r--r-- | sync/util/nigori.h | 5 |
3 files changed, 13 insertions, 10 deletions
diff --git a/sync/sync.gyp b/sync/sync.gyp index 5bda6b5..8a0eaa8 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': [ @@ -197,12 +194,13 @@ '../base/base.gyp:base', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', + 'protocol/sync_proto.gyp:sync_proto', 'sync', ], 'export_dependent_settings': [ - '../base/base.gyp:base', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', + 'protocol/sync_proto.gyp:sync_proto', 'sync', ], 'sources': [ @@ -254,17 +252,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', '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', ], @@ -335,7 +335,6 @@ '../base/base.gyp:run_all_unittests', 'sync_tests', ], - # TODO(akalin): This is needed because histogram.cc uses # leak_annotations.h, which pulls this in. Make 'base' # propagate this dependency. diff --git a/sync/util/nigori.cc b/sync/util/nigori.cc index 168d8eb..1b0e3c1 100644 --- a/sync/util/nigori.cc +++ b/sync/util/nigori.cc @@ -14,6 +14,7 @@ #include "base/sys_byteorder.h" #include "crypto/encryptor.h" #include "crypto/hmac.h" +#include "crypto/symmetric_key.h" using base::Base64Encode; using base::Base64Decode; diff --git a/sync/util/nigori.h b/sync/util/nigori.h index eb7dc5d..2606a44 100644 --- a/sync/util/nigori.h +++ b/sync/util/nigori.h @@ -9,7 +9,10 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "crypto/symmetric_key.h" + +namespace crypto { +class SymmetricKey; +} // namespace crypto namespace browser_sync { |