diff options
| -rw-r--r-- | build/common.gypi | 17 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 13 |
2 files changed, 13 insertions, 17 deletions
diff --git a/build/common.gypi b/build/common.gypi index fed9d96..1e76f75 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 462bcb2..dba3484 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 @@ -111,6 +118,12 @@ ['OS=="linux" and toolkit_views==1', {'sources/': [ ['include', '_views\\.cc$'], ]}], + ['OS=="win" and use_syncapi_stub==1', { + 'defines': ['COMPILING_SYNCAPI_STUB'], + }], # use_syncapi_stub==1 + ['OS=="win" and chrome_personalization==1', { + 'defines': ['CHROME_PERSONALIZATION=1'], + }], # chrome_personalization==1 ], }, 'targets': [ |