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

Side by Side Diff: talk/libjingle_tests.gyp

Issue 1553033002: Roll chromium_revision d66326c..4df108a (367167:367307) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Updated to 4df108a08782de0f5275a52491eedcaacfe1907f (367307) 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 # 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 'msvs_settings': { 132 'msvs_settings': {
133 'VCCLCompilerTool': { 133 'VCCLCompilerTool': {
134 'AdditionalOptions': [ 134 'AdditionalOptions': [
135 # Disable warnings failing when compiling with Clang on Windows. 135 # Disable warnings failing when compiling with Clang on Windows.
136 # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 136 # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366
137 '-Wno-unused-function', 137 '-Wno-unused-function',
138 ], 138 ],
139 }, 139 },
140 }, 140 },
141 },], 141 },],
142 ['clang==1', {
143 'cflags': [
144 '-Wno-unused-function',
145 ],
146 'xcode_settings': {
147 'WARNING_CFLAGS': ['-Wno-unused-function'],
148 },
149 },],
142 ['OS=="ios"', { 150 ['OS=="ios"', {
143 'sources!': [ 151 'sources!': [
144 'media/sctp/sctpdataengine_unittest.cc', 152 'media/sctp/sctpdataengine_unittest.cc',
145 ], 153 ],
146 }], 154 }],
147 ], 155 ],
148 }, # target libjingle_media_unittest 156 }, # target libjingle_media_unittest
149 { 157 {
150 'target_name': 'libjingle_p2p_unittest', 158 'target_name': 'libjingle_p2p_unittest',
151 'type': 'executable', 159 'type': 'executable',
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 'build/isolate.gypi', 461 'build/isolate.gypi',
454 ], 462 ],
455 'sources': [ 463 'sources': [
456 'libjingle_peerconnection_unittest.isolate', 464 'libjingle_peerconnection_unittest.isolate',
457 ], 465 ],
458 }, 466 },
459 ], 467 ],
460 }], 468 }],
461 ], 469 ],
462 } 470 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698