diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-09 22:06:15 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-09 22:06:15 +0000 |
| commit | c14d8e77a710ccb632e9113b3e8e5b6228025434 (patch) | |
| tree | 5a1af0961c59453e8cac3f156f307c221836898e /build/external_code.gypi | |
| parent | 7377db59c9a1b6d5b3724acee85fb5171ddc37a4 (diff) | |
| download | chromium_src-c14d8e77a710ccb632e9113b3e8e5b6228025434.zip chromium_src-c14d8e77a710ccb632e9113b3e8e5b6228025434.tar.gz chromium_src-c14d8e77a710ccb632e9113b3e8e5b6228025434.tar.bz2 | |
Let the chromium_code variable be applied in target scope in addition to .gyp
file scope.
To resolve bug 33186, I am trying to turn test_shell.gyp into test_shell.gypi,
and have webkit.gyp include it. webkit.gyp is not chromium_code, but the
targets in test_shell.gypi are.
BUG=33186
TEST=builds still work, -Werror and friends are still applied (or not) correctly
Review URL: http://codereview.chromium.org/595010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38519 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/external_code.gypi')
| -rw-r--r-- | build/external_code.gypi | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/build/external_code.gypi b/build/external_code.gypi index 4f59b2b..32991ef 100644 --- a/build/external_code.gypi +++ b/build/external_code.gypi @@ -5,37 +5,31 @@ { 'conditions': [ [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', { - 'target_defaults': { - 'cflags!': [ - '-Wall', - '-Wextra', - '-Werror', - ], - }, + 'cflags!': [ + '-Wall', + '-Wextra', + '-Werror', + ], }], [ 'OS=="win"', { - 'target_defaults': { - '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', - }, + '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"', { - 'target_defaults': { - 'xcode_settings': { - 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', - 'WARNING_CFLAGS!': ['-Wall'], - }, + 'xcode_settings': { + 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', + 'WARNING_CFLAGS!': ['-Wall'], }, }], ], |