diff options
| author | benm@google.com <benm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-20 14:51:27 +0000 |
|---|---|---|
| committer | benm@google.com <benm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-20 14:51:27 +0000 |
| commit | 394df25621818d83dfc09259bcedc84ea8a6241d (patch) | |
| tree | e60eb27ab6534703daeea9824553ed82b4e62d39 /webkit | |
| parent | 0563fb566893489db0980640a04e878ecc3fbb74 (diff) | |
| download | chromium_src-394df25621818d83dfc09259bcedc84ea8a6241d.zip chromium_src-394df25621818d83dfc09259bcedc84ea8a6241d.tar.gz chromium_src-394df25621818d83dfc09259bcedc84ea8a6241d.tar.bz2 | |
Remove duplicate msvs_disabled_warnings in test_shell.gypi
r183414 introduced a duplicate key to test_shell.gypi, collapse the
two entries into one.
TBR=jamesr
Review URL: https://codereview.chromium.org/12326006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183531 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index 6c63a0f..0f14269 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -157,7 +157,8 @@ 'cflags': ['-Wno-multichar'], }], ['OS=="win"', { - 'msvs_disabled_warnings': [ 4800 ], + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + 'msvs_disabled_warnings': [ 4800, 4267 ], 'link_settings': { 'libraries': [ '-lcomctl32.lib', @@ -170,8 +171,6 @@ 'dependencies': [ '<(DEPTH)/breakpad/breakpad.gyp:breakpad_handler', ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], }, { # else: OS!=win 'sources/': [ ['exclude', '_webtheme(control|engine)\.(cc|h)$'], |