diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-10 17:43:28 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-10 17:43:28 +0000 |
| commit | d854331ece6f611ff8ce6863dca4ef7b736bedae (patch) | |
| tree | dd6d1d7b731fad9f95430117dc6ddf31eec3fcbe /build/common.gypi | |
| parent | 1fcca9babb9af32eb06907b4389f55fcc0147337 (diff) | |
| download | chromium_src-d854331ece6f611ff8ce6863dca4ef7b736bedae.zip chromium_src-d854331ece6f611ff8ce6863dca4ef7b736bedae.tar.gz chromium_src-d854331ece6f611ff8ce6863dca4ef7b736bedae.tar.bz2 | |
Move build/external_code.gypi into build/common.gypi.
BUG=35184
TEST=none
Review URL: http://codereview.chromium.org/593025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index 602561b..5ac7623 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -403,8 +403,35 @@ ], # conditions for coverage }], # coverage!=0 ['chromium_code==0', { - 'includes': [ - 'external_code.gypi', + 'conditions': [ + [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + 'cflags!': [ + '-Wall', + '-Wextra', + '-Werror', + ], + }], + [ 'OS=="win"', { + 'defines': [ + '_CRT_SECURE_NO_DEPRECATE', + '_CRT_NONSTDC_NO_WARNINGS', + '_CRT_NONSTDC_NO_DEPRECATE', + '_SCL_SECURE_NO_DEPRECATE', + ], + 'msvs_disabled_warnings': [4800], + 'msvs_settings': { + 'VCCLCompilerTool': { + 'WarnAsError': 'false', + 'Detect64BitPortabilityProblems': 'false', + }, + }, + }], + [ 'OS=="mac"', { + 'xcode_settings': { + 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', + 'WARNING_CFLAGS!': ['-Wall'], + }, + }], ], }, { # In Chromium code, we define __STDC_FORMAT_MACROS in order to get the |