diff options
| author | munjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 19:40:26 +0000 |
|---|---|---|
| committer | munjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 19:40:26 +0000 |
| commit | 80cdd3112da7ef937f57d06cda2b752890a6355d (patch) | |
| tree | 753b1ff2a567952265c78b8baf16e2dbf0212684 | |
| parent | 360960901b9932e4ef635a29ce5a0c31c60ee227 (diff) | |
| download | chromium_src-80cdd3112da7ef937f57d06cda2b752890a6355d.zip chromium_src-80cdd3112da7ef937f57d06cda2b752890a6355d.tar.gz chromium_src-80cdd3112da7ef937f57d06cda2b752890a6355d.tar.bz2 | |
Move the sync related GYP variables and conditions to chrome.gyp from
common.gypi
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/164445
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23343 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 17 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 13 |
2 files changed, 12 insertions, 18 deletions
diff --git a/build/common.gypi b/build/common.gypi index 99025df..0b567b2 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -94,12 +94,6 @@ '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. @@ -183,17 +177,6 @@ ['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"', { diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 4b286b4..6b19598 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -5,6 +5,13 @@ { 'variables': { 'chromium_code': 1, + + # 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, + # Define the common dependencies that contain all the actual # Chromium functionality. This list gets pulled in below by # the link of the actual chrome (or chromium) executable on @@ -2215,10 +2222,14 @@ }, 'conditions': [ ['use_syncapi_stub==1', { + 'defines': ['COMPILING_SYNCAPI_STUB'], 'sources': [ 'browser/sync/engine/syncapi_stub.cc', ], - }] # use_syncapi_stub==1 + }], # use_syncapi_stub==1 + ['chrome_personalization==1', { + 'defines': ['CHROME_PERSONALIZATION=1'], + }], # chrome_personalization==1 ], }, { # 'OS!="win" 'sources/': [ |