diff options
| author | vabr <vabr@chromium.org> | 2015-12-01 01:47:44 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-01 09:48:51 +0000 |
| commit | 4bcbb121d634b0d087af5e35dcefface2b33aec2 (patch) | |
| tree | 737ad3d5a9e84b3db760c52db1cfb03bc11d762c /components/sync_driver.gypi | |
| parent | 3c201fa28b53246177fed8d6b9454da4b0625df2 (diff) | |
| download | chromium_src-4bcbb121d634b0d087af5e35dcefface2b33aec2.zip chromium_src-4bcbb121d634b0d087af5e35dcefface2b33aec2.tar.gz chromium_src-4bcbb121d634b0d087af5e35dcefface2b33aec2.tar.bz2 | |
Reland of Convert enable_pre_sync_backup flag to new flags system. (patchset #1 id:1 of https://codereview.chromium.org/1490713002/ )
Reason for revert:
Speculative revert did not help. Relanding.
Original issue's description:
> Revert of Convert enable_pre_sync_backup flag to new flags system. (patchset #2 id:20001 of https://codereview.chromium.org/1487873003/ )
>
> Reason for revert:
> Speculative revert, CrOS compile broken, more info on the bug.
> BUG=563927
>
> Original issue's description:
> > Convert enable_pre_sync_backup flag to new flags system.
> >
> > This flag's usage is very isolated so is a good candidate for the new system. There is now a generated header for the #define rather than a global define.
> >
> > Reland of http://crrev.com/1478623004#ps60001
> > TBR=zea@chromium.org
> >
> > Committed: https://crrev.com/db7f9756dc6e236589b90c76d6fa0f1244601e78
> > Cr-Commit-Position: refs/heads/master@{#362365}
>
> TBR=zea@chromium.org,brettw@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
>
> Committed: https://crrev.com/3c201fa28b53246177fed8d6b9454da4b0625df2
> Cr-Commit-Position: refs/heads/master@{#362368}
TBR=zea@chromium.org,brettw@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=563927
Review URL: https://codereview.chromium.org/1490723002
Cr-Commit-Position: refs/heads/master@{#362369}
Diffstat (limited to 'components/sync_driver.gypi')
| -rw-r--r-- | components/sync_driver.gypi | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/components/sync_driver.gypi b/components/sync_driver.gypi index 7bda955..fa4aeb3 100644 --- a/components/sync_driver.gypi +++ b/components/sync_driver.gypi @@ -18,6 +18,7 @@ 'invalidation_public', 'os_crypt', 'signin_core_browser', + 'sync_driver_features', 'version_info', ], 'include_dirs': [ @@ -152,6 +153,26 @@ ], }, { + # GN version: //components/sync_driver:features + 'target_name': 'sync_driver_features', + 'includes': [ '../build/buildflag_header.gypi' ], + 'variables': { + 'buildflag_header_path': 'components/sync_driver/sync_driver_features.h', + 'variables': { + 'conditions': [ + ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', { + 'enable_pre_sync_backup%': 1, + }, { + 'enable_pre_sync_backup%': 0, + }], + ], + }, + 'buildflag_flags': [ + "ENABLE_PRE_SYNC_BACKUP=<(enable_pre_sync_backup)", + ], + }, + }, + { 'target_name': 'sync_driver_test_support', 'type': 'static_library', 'dependencies': [ |