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

Unified Diff: talk/libjingle.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.gyp
diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp
index 09daed7f1712100a11cdef4a70fdcbabdcc68dc8..123d8379d1e2e1a597034c58ad0bea9b7bfc2036 100755
--- a/talk/libjingle.gyp
+++ b/talk/libjingle.gyp
@@ -188,57 +188,4 @@
],
}],
],
- 'targets': [
- {
- 'target_name': 'libjingle_p2p',
- 'type': 'static_library',
- 'dependencies': [
- '<(webrtc_root)/base/base.gyp:rtc_base',
- '<(webrtc_root)/media/media.gyp:rtc_media',
- ],
- 'conditions': [
- ['build_libsrtp==1', {
- 'dependencies': [
- '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
- ],
- }],
- ],
- 'include_dirs': [
- '<(DEPTH)/testing/gtest/include',
- ],
- 'include_dirs!': [
- '<(DEPTH)/webrtc',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '<(DEPTH)/testing/gtest/include',
- ],
- 'include_dirs!': [
- '<(DEPTH)/webrtc',
- ],
- },
- 'sources': [
- 'session/media/audiomonitor.cc',
- 'session/media/audiomonitor.h',
- 'session/media/bundlefilter.cc',
- 'session/media/bundlefilter.h',
- 'session/media/channel.cc',
- 'session/media/channel.h',
- 'session/media/channelmanager.cc',
- 'session/media/channelmanager.h',
- 'session/media/currentspeakermonitor.cc',
- 'session/media/currentspeakermonitor.h',
- 'session/media/mediamonitor.cc',
- 'session/media/mediamonitor.h',
- 'session/media/mediasession.cc',
- 'session/media/mediasession.h',
- 'session/media/mediasink.h',
- 'session/media/rtcpmuxfilter.cc',
- 'session/media/rtcpmuxfilter.h',
- 'session/media/srtpfilter.cc',
- 'session/media/srtpfilter.h',
- 'session/media/voicechannel.h',
- ],
- }, # target libjingle_p2p
- ],
}

Powered by Google App Engine
This is Rietveld 408576698