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

Side by Side Diff: talk/libjingle_tests.gyp

Issue 1522223002: Disable warnings failing when using Clang on Windows (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rolled winsdk_samples Created 5 years 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
« no previous file with comments | « DEPS ('k') | third_party/winsdk_samples/winsdk_samples.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # libjingle 2 # libjingle
3 # Copyright 2012 Google Inc. 3 # Copyright 2012 Google Inc.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are met: 6 # modification, are permitted provided that the following conditions are met:
7 # 7 #
8 # 1. Redistributions of source code must retain the above copyright notice, 8 # 1. Redistributions of source code must retain the above copyright notice,
9 # this list of conditions and the following disclaimer. 9 # this list of conditions and the following disclaimer.
10 # 2. Redistributions in binary form must reproduce the above copyright notice, 10 # 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 'VCLinkerTool': { 121 'VCLinkerTool': {
122 'AdditionalDependencies': [ 122 'AdditionalDependencies': [
123 # TODO(ronghuawu): Since we've included strmiids in 123 # TODO(ronghuawu): Since we've included strmiids in
124 # libjingle_media target, we shouldn't need this here. 124 # libjingle_media target, we shouldn't need this here.
125 # Find out why it doesn't work without this. 125 # Find out why it doesn't work without this.
126 'strmiids.lib', 126 'strmiids.lib',
127 ], 127 ],
128 }, 128 },
129 }, 129 },
130 }], 130 }],
131 ['OS=="win" and clang==1', {
132 'msvs_settings': {
133 'VCCLCompilerTool': {
134 'AdditionalOptions': [
135 # Disable warnings failing when compiling with Clang on Windows.
136 # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366
137 '-Wno-unused-function',
138 ],
139 },
140 },
141 },],
131 ['OS=="ios"', { 142 ['OS=="ios"', {
132 'sources!': [ 143 'sources!': [
133 'media/sctp/sctpdataengine_unittest.cc', 144 'media/sctp/sctpdataengine_unittest.cc',
134 ], 145 ],
135 }], 146 }],
136 ], 147 ],
137 }, # target libjingle_media_unittest 148 }, # target libjingle_media_unittest
138 { 149 {
139 'target_name': 'libjingle_p2p_unittest', 150 'target_name': 'libjingle_p2p_unittest',
140 'type': 'executable', 151 'type': 'executable',
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 # implementation. gmock supports this scenario by providing its 244 # implementation. gmock supports this scenario by providing its
234 # own implementation but we must opt in to it. 245 # own implementation but we must opt in to it.
235 'defines': [ 246 'defines': [
236 'GTEST_USE_OWN_TR1_TUPLE=1', 247 'GTEST_USE_OWN_TR1_TUPLE=1',
237 # GTEST_USE_OWN_TR1_TUPLE only works if GTEST_HAS_TR1_TUPLE is set. 248 # GTEST_USE_OWN_TR1_TUPLE only works if GTEST_HAS_TR1_TUPLE is set.
238 # gmock r625 made it so that GTEST_HAS_TR1_TUPLE is set to 0 249 # gmock r625 made it so that GTEST_HAS_TR1_TUPLE is set to 0
239 # automatically on android, so it has to be set explicitly here. 250 # automatically on android, so it has to be set explicitly here.
240 'GTEST_HAS_TR1_TUPLE=1', 251 'GTEST_HAS_TR1_TUPLE=1',
241 ], 252 ],
242 }], 253 }],
254 ['OS=="win" and clang==1', {
255 'msvs_settings': {
256 'VCCLCompilerTool': {
257 'AdditionalOptions': [
258 # Disable warnings failing when compiling with Clang on Windows.
259 # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366
260 '-Wno-unused-function',
261 ],
262 },
263 },
264 }],
243 ], 265 ],
244 }, # target libjingle_peerconnection_unittest 266 }, # target libjingle_peerconnection_unittest
245 ], 267 ],
246 'conditions': [ 268 'conditions': [
247 ['OS=="linux"', { 269 ['OS=="linux"', {
248 'variables': { 270 'variables': {
249 'junit_jar': '<(DEPTH)/third_party/junit-jar/junit-4.11.jar', 271 'junit_jar': '<(DEPTH)/third_party/junit-jar/junit-4.11.jar',
250 }, 272 },
251 'targets': [ 273 'targets': [
252 { 274 {
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 'build/isolate.gypi', 453 'build/isolate.gypi',
432 ], 454 ],
433 'sources': [ 455 'sources': [
434 'libjingle_peerconnection_unittest.isolate', 456 'libjingle_peerconnection_unittest.isolate',
435 ], 457 ],
436 }, 458 },
437 ], 459 ],
438 }], 460 }],
439 ], 461 ],
440 } 462 }
OLDNEW
« no previous file with comments | « DEPS ('k') | third_party/winsdk_samples/winsdk_samples.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698