diff options
| author | ivankr@chromium.org <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 18:17:22 +0000 |
|---|---|---|
| committer | ivankr@chromium.org <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 18:17:22 +0000 |
| commit | b6a5ac9388e7102acfba1fb59cf4b71da5142ea3 (patch) | |
| tree | 7efb9776132a59f32e1ac58c93f5cd23da1852ef /build/common.gypi | |
| parent | 25a4f08e8800de1cc628320b23e76a2db00d43e6 (diff) | |
| download | chromium_src-b6a5ac9388e7102acfba1fb59cf4b71da5142ea3.zip chromium_src-b6a5ac9388e7102acfba1fb59cf4b71da5142ea3.tar.gz chromium_src-b6a5ac9388e7102acfba1fb59cf4b71da5142ea3.tar.bz2 | |
RLZ: remove hard-coded Win || Mac conditions.
Add enable_rlz GYP variable and rely on ENABLE_RLZ macro instead of hard-coded Win || Mac checks.
Also, clean compile by gcc (signed/unsigned mismatch, etc).
BUG=157348
Review URL: https://chromiumcodereview.appspot.com/11226060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164681 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/build/common.gypi b/build/common.gypi index af5674a..d017bee 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -380,9 +380,6 @@ # gyp will remove duplicate flags, causing isolate.py to be confused. 'test_isolation_outdir%': '<(PRODUCT_DIR)/isolate', - # Force rlz to use chrome's networking stack. - 'force_rlz_use_chrome_net%': 1, - 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86', 'wix_path%': '<(DEPTH)/third_party/wix', @@ -655,7 +652,6 @@ 'enable_printing%': '<(enable_printing)', 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', 'disable_ftp_support%': '<(disable_ftp_support)', - 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)', 'enable_task_manager%': '<(enable_task_manager)', 'sas_dll_path%': '<(sas_dll_path)', 'wix_path%': '<(wix_path)', @@ -911,6 +907,9 @@ 'windows_sdk_default_path': '<(DEPTH)/third_party/platformsdk_win8/files', 'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files', + # Whether rlz is enabled. + 'enable_rlz%': 0, + 'conditions': [ ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(windows_sdk_default_path))"=="True"', { 'windows_sdk_path%': '<(windows_sdk_default_path)', @@ -1392,6 +1391,11 @@ # Keep the code under #ifndef NVALGRIND. 'release_valgrind_build': 1, }], + + # Enable RLZ on Win and Mac. + ['branding=="Chrome" and (OS=="win" or OS=="mac")', { + 'enable_rlz%': 1, + }], ], # List of default apps to install in new profiles. The first list contains @@ -1526,7 +1530,7 @@ ], }, }], - ['branding=="Chrome" and (OS=="win" or OS=="mac")', { + ['enable_rlz==1', { 'defines': ['ENABLE_RLZ'], }], ['component=="shared_library"', { |