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

Unified Diff: webrtc/pc/pc.gyp

Issue 1843193002: Reland of move {media,p2p,pc,xmllite,xmpp}_tests.gypi files. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased and moved isolate targets into include_tests==1 condition Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/p2p/p2p_tests.gypi ('k') | webrtc/pc/pc_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/pc.gyp
diff --git a/webrtc/pc/pc.gyp b/webrtc/pc/pc.gyp
index 40874b1a45d99bf853ead62410821b64853642c2..b07f7b72638e8ed044bdf9e5abbde89ba5cbc3a9 100755
--- a/webrtc/pc/pc.gyp
+++ b/webrtc/pc/pc.gyp
@@ -72,5 +72,78 @@
'voicechannel.h',
],
}, # target rtc_pc
- ],
+ ], # targets
+ 'conditions': [
+ ['include_tests==1', {
+ 'targets' : [
+ {
+ 'target_name': 'rtc_pc_unittests',
+ 'type': 'executable',
+ 'dependencies': [
+ '<(webrtc_root)/api/api.gyp:libjingle_peerconnection',
+ '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
+ '<(webrtc_root)/media/media.gyp:rtc_unittest_main',
+ '<(webrtc_root)/pc/pc.gyp:rtc_pc',
+ ],
+ 'include_dirs': [
+ '<(DEPTH)/third_party/libsrtp/srtp',
+ ],
+ 'sources': [
+ 'bundlefilter_unittest.cc',
+ 'channel_unittest.cc',
+ 'channelmanager_unittest.cc',
+ 'currentspeakermonitor_unittest.cc',
+ 'mediasession_unittest.cc',
+ 'rtcpmuxfilter_unittest.cc',
+ 'srtpfilter_unittest.cc',
+ ],
+ # TODO(kjellander): Make the code compile without disabling these flags.
+ # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307
+ 'cflags_cc!': [
+ '-Wnon-virtual-dtor',
+ ],
+ 'conditions': [
+ ['clang==0', {
+ 'cflags': [
+ '-Wno-maybe-uninitialized', # Only exists for GCC.
+ ],
+ }],
+ ['build_libsrtp==1', {
+ 'dependencies': [
+ '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
+ ],
+ }],
+ ['OS=="win"', {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'AdditionalDependencies': [
+ 'strmiids.lib',
+ ],
+ },
+ },
+ }],
+ ],
+ }, # target rtc_pc_unittests
+ ], # targets
+ 'conditions': [
+ ['test_isolation_mode != "noop"', {
+ 'targets': [
+ {
+ 'target_name': 'rtc_pc_unittests_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'rtc_pc_unittests',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ ],
+ 'sources': [
+ 'rtc_pc_unittests.isolate',
+ ],
+ },
+ ],
+ }],
+ ], # conditions
+ }], # include_tests==1
+ ], # conditions
}
« no previous file with comments | « webrtc/p2p/p2p_tests.gypi ('k') | webrtc/pc/pc_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698