diff options
author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 19:28:46 +0000 |
---|---|---|
committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 19:28:46 +0000 |
commit | 001bbfdc4da9f8aec8e1a30770a1e4cef2347e0a (patch) | |
tree | 1017f4628ef475caaf86573c9c8ec2e7aa341997 /sync/sync.gyp | |
parent | cb363e702cb70f99c707be975e57015b438eaef0 (diff) | |
download | chromium_src-001bbfdc4da9f8aec8e1a30770a1e4cef2347e0a.zip chromium_src-001bbfdc4da9f8aec8e1a30770a1e4cef2347e0a.tar.gz chromium_src-001bbfdc4da9f8aec8e1a30770a1e4cef2347e0a.tar.bz2 |
Move sync/notifier to components/invalidation
Moves all code remaining in sync/notifier to components/invalidation.
Updates gyp files, DEPS, and #includes accordingly.
In terms of program behavior, this should be one big no-op. This CL
contains no non-trivial code changes.
In terms of the build system, this is a significant change. Symbols
that were previously exported through sync_notifier and related targets
have moved into the components/invalidation related targets. Some
SYNC_EXPORT macros have been replaced with INVALIDATION_EXPORT, which is
significant since INVALIDATION_EXPORT is currently a no-op but
SYNC_EXPORT has meaning under some build configurations.
Unlike most other files in sync/notifier, invalidation_util.{cc,h} was
moved to sync/internal_api/public/base. This is so it could be
referenced from sync/internal_api/public/base/invalidation.cc. This is
a slight regression, but it should be fixed in the next CL when we move
all invalidations-related code out of sync/internal_api.
TBR=rogerta,benwells
BUG=259559
Review URL: https://codereview.chromium.org/387733004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/sync.gyp')
-rw-r--r-- | sync/sync.gyp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/sync/sync.gyp b/sync/sync.gyp index 6a14e84..3a840e1 100644 --- a/sync/sync.gyp +++ b/sync/sync.gyp @@ -16,10 +16,10 @@ # Notes: # 1) In static mode, the public 'sync' target has a target type of 'none', # and is composed of the static library targets 'sync_api', 'sync_core', - # 'sync_internal_api', 'sync_notifier', and 'sync_proto'. + # 'sync_internal_api', and 'sync_proto'. # 2) In component mode, we build the public 'sync' target into a single DLL, # which includes the contents of sync_api.gypi, sync_core.gypi, - # sync_internal_api.gypi, sync_notifier.gypi, and sync_proto.gypi. + # sync_internal_api.gypi, and sync_proto.gypi. # 3) All external targets that depend on anything in sync/ must simply # declare a dependency on 'sync.gyp:sync' ['component=="static_library"', { @@ -32,11 +32,9 @@ 'sync_api', 'sync_core', 'sync_internal_api', - 'sync_notifier', 'sync_proto', ], 'export_dependent_settings': [ - 'sync_notifier', 'sync_proto', ], }, @@ -64,11 +62,9 @@ 'sync_core.gypi', ], 'dependencies': [ - 'sync_notifier', 'sync_proto', ], 'export_dependent_settings': [ - 'sync_notifier', 'sync_proto', ], }, @@ -83,7 +79,6 @@ ], 'dependencies': [ 'sync_core', - 'sync_notifier', 'sync_proto', ], 'export_dependent_settings': [ @@ -92,16 +87,6 @@ ], }, - # The sync notifications library. - { - 'target_name': 'sync_notifier', - 'type': 'static_library', - 'variables': { 'enable_wexit_time_destructors': 1, }, - 'includes': [ - 'sync_notifier.gypi', - ], - }, - # The sync protocol buffer library. { # GN version: //sync/protocol @@ -125,7 +110,6 @@ 'sync_api.gypi', 'sync_core.gypi', 'sync_internal_api.gypi', - 'sync_notifier.gypi', 'sync_proto.gypi', ], }, |