Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2294)

Side by Side Diff: webrtc/base/base_tests.gyp

Issue 1593713013: Roll chromium_revision 7a4fb8d..f527e86 (370025:370073) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Fix/disable Win Clang warnings Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 { 8 {
9 'includes': [ '../build/common.gypi', ], 9 'includes': [ '../build/common.gypi', ],
10 'targets': [ 10 'targets': [
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 'win32windowpicker_unittest.cc', 134 'win32windowpicker_unittest.cc',
135 ], 135 ],
136 }], 136 }],
137 ['OS=="win" and clang==1', { 137 ['OS=="win" and clang==1', {
138 'msvs_settings': { 138 'msvs_settings': {
139 'VCCLCompilerTool': { 139 'VCCLCompilerTool': {
140 'AdditionalOptions': [ 140 'AdditionalOptions': [
141 # Disable warnings failing when compiling with Clang on Window s. 141 # Disable warnings failing when compiling with Clang on Window s.
142 # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 142 # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366
143 '-Wno-missing-braces', 143 '-Wno-missing-braces',
144 '-Wno-sign-compare',
144 '-Wno-unused-const-variable', 145 '-Wno-unused-const-variable',
145 ], 146 ],
146 }, 147 },
147 }, 148 },
148 }], 149 }],
149 ['OS=="mac"', { 150 ['OS=="mac"', {
150 'sources': [ 151 'sources': [
151 'macutils_unittest.cc', 152 'macutils_unittest.cc',
152 ], 153 ],
153 }], 154 }],
154 ['os_posix==1', { 155 ['os_posix==1', {
155 'sources': [ 156 'sources': [
156 'ssladapter_unittest.cc', 157 'ssladapter_unittest.cc',
157 'sslidentity_unittest.cc', 158 'sslidentity_unittest.cc',
158 'sslstreamadapter_unittest.cc', 159 'sslstreamadapter_unittest.cc',
159 ], 160 ],
160 }], 161 }],
161 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', { 162 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
162 'defines': [ 163 'defines': [
163 'CARBON_DEPRECATED=YES', 164 'CARBON_DEPRECATED=YES',
164 ], 165 ],
165 }], 166 }],
166 ], # conditions 167 ], # conditions
167 }, 168 },
168 }, 169 },
169 ], 170 ],
170 } 171 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698