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

Side by Side Diff: talk/libjingle.gyp

Issue 1507973003: Restoring behavior where PeerConnection tracks changes to MediaStreams. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing merge conflicts. 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 | « talk/app/webrtc/peerconnectioninterface_unittest.cc ('k') | no next file » | 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 727 matching lines...) Expand 10 before | Expand all | Expand 10 after
738 'app/webrtc/jsepsessiondescription.h', 738 'app/webrtc/jsepsessiondescription.h',
739 'app/webrtc/localaudiosource.cc', 739 'app/webrtc/localaudiosource.cc',
740 'app/webrtc/localaudiosource.h', 740 'app/webrtc/localaudiosource.h',
741 'app/webrtc/mediaconstraintsinterface.cc', 741 'app/webrtc/mediaconstraintsinterface.cc',
742 'app/webrtc/mediaconstraintsinterface.h', 742 'app/webrtc/mediaconstraintsinterface.h',
743 'app/webrtc/mediacontroller.cc', 743 'app/webrtc/mediacontroller.cc',
744 'app/webrtc/mediacontroller.h', 744 'app/webrtc/mediacontroller.h',
745 'app/webrtc/mediastream.cc', 745 'app/webrtc/mediastream.cc',
746 'app/webrtc/mediastream.h', 746 'app/webrtc/mediastream.h',
747 'app/webrtc/mediastreaminterface.h', 747 'app/webrtc/mediastreaminterface.h',
748 'app/webrtc/mediastreamobserver.cc',
749 'app/webrtc/mediastreamobserver.h',
748 'app/webrtc/mediastreamprovider.h', 750 'app/webrtc/mediastreamprovider.h',
749 'app/webrtc/mediastreamproxy.h', 751 'app/webrtc/mediastreamproxy.h',
750 'app/webrtc/mediastreamtrack.h', 752 'app/webrtc/mediastreamtrack.h',
751 'app/webrtc/mediastreamtrackproxy.h', 753 'app/webrtc/mediastreamtrackproxy.h',
752 'app/webrtc/notifier.h', 754 'app/webrtc/notifier.h',
753 'app/webrtc/peerconnection.cc', 755 'app/webrtc/peerconnection.cc',
754 'app/webrtc/peerconnection.h', 756 'app/webrtc/peerconnection.h',
755 'app/webrtc/peerconnectionfactory.cc', 757 'app/webrtc/peerconnectionfactory.cc',
756 'app/webrtc/peerconnectionfactory.h', 758 'app/webrtc/peerconnectionfactory.h',
757 'app/webrtc/peerconnectionfactoryproxy.h', 759 'app/webrtc/peerconnectionfactoryproxy.h',
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 ['OS=="android" and build_with_chromium==0', { 800 ['OS=="android" and build_with_chromium==0', {
799 'sources': [ 801 'sources': [
800 'app/webrtc/androidvideocapturer.h', 802 'app/webrtc/androidvideocapturer.h',
801 'app/webrtc/androidvideocapturer.cc', 803 'app/webrtc/androidvideocapturer.cc',
802 ], 804 ],
803 }], 805 }],
804 ], 806 ],
805 }, # target libjingle_peerconnection 807 }, # target libjingle_peerconnection
806 ], 808 ],
807 } 809 }
OLDNEW
« no previous file with comments | « talk/app/webrtc/peerconnectioninterface_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698