diff options
| author | sidchat@google.com <sidchat@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 22:35:40 +0000 |
|---|---|---|
| committer | sidchat@google.com <sidchat@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 22:35:40 +0000 |
| commit | 5e344a39782b73070a679f0d12a996a012c7e3de (patch) | |
| tree | 2d9d830e101f90be9c8066cb8ac5a3aa97c632be /build | |
| parent | 6df6420891ef965e1eb1fdfdf9fdfdeb56f7bd0f (diff) | |
| download | chromium_src-5e344a39782b73070a679f0d12a996a012c7e3de.zip chromium_src-5e344a39782b73070a679f0d12a996a012c7e3de.tar.gz chromium_src-5e344a39782b73070a679f0d12a996a012c7e3de.tar.bz2 | |
Reverting 23343.
Review URL: http://codereview.chromium.org/164525
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23372 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index 0b567b2..99025df 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -94,6 +94,12 @@ 'chromeos%': 0, + # Whether or not browser sync code is built in. + 'chrome_personalization%': 1, + + # Used to build and statically link a stub (no-op) syncapi engine. + 'use_syncapi_stub%' : 1, + # Set the restrictions on the SUID sandbox binary. # Path: only exec the hard coded chrome binary path # User: only exec binaries owned by the running user. @@ -177,6 +183,17 @@ ['chromeos==1', { 'defines': ['OS_CHROMEOS=1'], }], + ['chrome_personalization==1', { + 'conditions': [ + ['OS=="win"', { + # For now sync is only enabled on windows. + 'defines': ['CHROME_PERSONALIZATION=1'], + }], # OS==win + ], # conditions for chrome_personalization + }], # chrome_personalization==1 + ['use_syncapi_stub==1', { + 'defines': ['COMPILING_SYNCAPI_STUB'], + }], # use_syncapi_stub==1 ['coverage!=0', { 'conditions': [ ['OS=="mac"', { |