OLD | NEW |
---|---|
1 # Copyright 2011 Google Inc. | 1 # Copyright 2011 Google Inc. |
2 # | 2 # |
3 # Licensed under the Apache License, Version 2.0 (the "License"); | 3 # Licensed under the Apache License, Version 2.0 (the "License"); |
4 # you may not use this file except in compliance with the License. | 4 # you may not use this file except in compliance with the License. |
5 # You may obtain a copy of the License at | 5 # You may obtain a copy of the License at |
6 # | 6 # |
7 # http://www.apache.org/licenses/LICENSE-2.0 | 7 # http://www.apache.org/licenses/LICENSE-2.0 |
8 # | 8 # |
9 # Unless required by applicable law or agreed to in writing, software | 9 # Unless required by applicable law or agreed to in writing, software |
10 # distributed under the License is distributed on an "AS IS" BASIS, | 10 # distributed under the License is distributed on an "AS IS" BASIS, |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
56 'src/gflags_completions.cc', | 56 'src/gflags_completions.cc', |
57 'src/gflags_reporting.cc', | 57 'src/gflags_reporting.cc', |
58 ], | 58 ], |
59 'conditions': [ | 59 'conditions': [ |
60 ['OS=="win"', { | 60 ['OS=="win"', { |
61 'sources': [ | 61 'sources': [ |
62 'src/windows/port.cc', | 62 'src/windows/port.cc', |
63 ], | 63 ], |
64 # Suppress warnings about WIN32_LEAN_AND_MEAN and size_t truncation. | 64 # Suppress warnings about WIN32_LEAN_AND_MEAN and size_t truncation. |
65 'msvs_disabled_warnings': [4005, 4267], | 65 'msvs_disabled_warnings': [4005, 4267], |
66 'msvs_settings': { | |
kjellander_webrtc
2015/10/28 12:09:01
After looking at the trybot failure for regular (n
| |
67 'VCCLCompilerTool': { | |
68 'AdditionalOptions!': [ | |
69 '-Wheader-hygiene', # Suppress warning about using namespace. | |
70 ], | |
71 'AdditionalOptions': [ | |
72 '-Wno-unused-local-typedef', # Suppress unused private typedef. | |
73 ], | |
74 }, | |
75 }, | |
66 }], | 76 }], |
67 # TODO(andrew): Look into fixing this warning upstream: | 77 # TODO(andrew): Look into fixing this warning upstream: |
68 # http://code.google.com/p/webrtc/issues/detail?id=760 | 78 # http://code.google.com/p/webrtc/issues/detail?id=760 |
69 ['clang==1', { | 79 ['clang==1', { |
70 'cflags!': ['-Wheader-hygiene',], | 80 'cflags!': ['-Wheader-hygiene',], |
71 'xcode_settings': { | 81 'xcode_settings': { |
72 'WARNING_CFLAGS!': ['-Wheader-hygiene',], | 82 'WARNING_CFLAGS!': ['-Wheader-hygiene',], |
73 }, | 83 }, |
74 }], | 84 }], |
75 ], | 85 ], |
76 }, | 86 }, |
77 ], | 87 ], |
78 } | 88 } |
OLD | NEW |