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

Unified Diff: talk/libjingle_tests.gyp

Issue 1691463002: Move talk/session/media -> webrtc/pc (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Make the test target inherit the defines for rtc_pc Created 4 years, 10 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
Index: talk/libjingle_tests.gyp
diff --git a/talk/libjingle_tests.gyp b/talk/libjingle_tests.gyp
index f45a99c0252511ba47ad818aae4a4c9df1df1e0b..fe3ba917cd6657da6d362c993d81e9984a33af2f 100755
--- a/talk/libjingle_tests.gyp
+++ b/talk/libjingle_tests.gyp
@@ -26,46 +26,6 @@
{
'includes': ['build/common.gypi'],
- 'targets': [
- {
- 'target_name': 'libjingle_p2p_unittest',
- 'type': 'executable',
- 'dependencies': [
- '<(webrtc_root)/api/api.gyp:libjingle_peerconnection',
- '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
- '<(webrtc_root)/webrtc.gyp:rtc_unittest_main',
- 'libjingle.gyp:libjingle_p2p',
- ],
- 'include_dirs': [
- '<(DEPTH)/third_party/libsrtp/srtp',
- ],
- 'sources': [
- 'session/media/bundlefilter_unittest.cc',
- 'session/media/channel_unittest.cc',
- 'session/media/channelmanager_unittest.cc',
- 'session/media/currentspeakermonitor_unittest.cc',
- 'session/media/mediasession_unittest.cc',
- 'session/media/rtcpmuxfilter_unittest.cc',
- 'session/media/srtpfilter_unittest.cc',
- ],
- 'conditions': [
- ['build_libsrtp==1', {
- 'dependencies': [
- '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
- ],
- }],
- ['OS=="win"', {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'AdditionalDependencies': [
- 'strmiids.lib',
- ],
- },
- },
- }],
- ],
- }, # target libjingle_p2p_unittest
- ],
'conditions': [
['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
# The >=10.7 above is required to make ARC link cleanly (e.g. as
@@ -128,22 +88,5 @@
}, # target apprtc_signaling_gunit_test
],
}],
- ['test_isolation_mode != "noop"', {
- 'targets': [
- {
- 'target_name': 'libjingle_p2p_unittest_run',
- 'type': 'none',
- 'dependencies': [
- 'libjingle_p2p_unittest',
- ],
- 'includes': [
- 'build/isolate.gypi',
- ],
- 'sources': [
- 'libjingle_p2p_unittest.isolate',
- ],
- },
- ],
- }],
],
}

Powered by Google App Engine
This is Rietveld 408576698