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 /rlz/rlz.gyp | |
| 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 'rlz/rlz.gyp')
| -rw-r--r-- | rlz/rlz.gyp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/rlz/rlz.gyp b/rlz/rlz.gyp index 5284134..123eaa0 100644 --- a/rlz/rlz.gyp +++ b/rlz/rlz.gyp @@ -6,12 +6,11 @@ 'variables': { 'chromium_code': 1, 'variables': { - # Set force_rlz_use_chrome_net to 1 to use chrome's network stack instead - # of win inet. - 'force_rlz_use_chrome_net%': 0, + # Force rlz to use chrome's networking stack. + 'force_rlz_use_chrome_net%': 1, }, 'conditions': [ - ['force_rlz_use_chrome_net or OS=="mac"', { + ['force_rlz_use_chrome_net or OS!="win"', { 'rlz_use_chrome_net%': 1, }, { 'rlz_use_chrome_net%': 0, |