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

Side by Side Diff: talk/libjingle.gyp

Issue 1269843005: Added DtlsCertificate, a ref counted object owning an SSLIdentity (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Merge with master Created 5 years, 4 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 679 matching lines...) Expand 10 before | Expand all | Expand 10 after
690 'session/media/typingmonitor.cc', 690 'session/media/typingmonitor.cc',
691 'session/media/typingmonitor.h', 691 'session/media/typingmonitor.h',
692 'session/media/voicechannel.h', 692 'session/media/voicechannel.h',
693 ], 693 ],
694 }, # target libjingle_p2p 694 }, # target libjingle_p2p
695 { 695 {
696 'target_name': 'libjingle_peerconnection', 696 'target_name': 'libjingle_peerconnection',
697 'type': 'static_library', 697 'type': 'static_library',
698 'dependencies': [ 698 'dependencies': [
699 'libjingle', 699 'libjingle',
700 'libjingle_dtls',
700 'libjingle_media', 701 'libjingle_media',
701 'libjingle_p2p', 702 'libjingle_p2p',
702 ], 703 ],
703 'sources': [ 704 'sources': [
704 'app/webrtc/audiotrack.cc', 705 'app/webrtc/audiotrack.cc',
705 'app/webrtc/audiotrack.h', 706 'app/webrtc/audiotrack.h',
706 'app/webrtc/audiotrackrenderer.cc', 707 'app/webrtc/audiotrackrenderer.cc',
707 'app/webrtc/audiotrackrenderer.h', 708 'app/webrtc/audiotrackrenderer.h',
708 'app/webrtc/datachannel.cc', 709 'app/webrtc/datachannel.cc',
709 'app/webrtc/datachannel.h', 710 'app/webrtc/datachannel.h',
710 'app/webrtc/datachannelinterface.h', 711 'app/webrtc/datachannelinterface.h',
711 'app/webrtc/dtlsidentitystore.cc',
712 'app/webrtc/dtlsidentitystore.h',
713 'app/webrtc/dtmfsender.cc', 712 'app/webrtc/dtmfsender.cc',
714 'app/webrtc/dtmfsender.h', 713 'app/webrtc/dtmfsender.h',
715 'app/webrtc/dtmfsenderinterface.h', 714 'app/webrtc/dtmfsenderinterface.h',
716 'app/webrtc/fakeportallocatorfactory.h', 715 'app/webrtc/fakeportallocatorfactory.h',
717 'app/webrtc/jsep.h', 716 'app/webrtc/jsep.h',
718 'app/webrtc/jsepicecandidate.cc', 717 'app/webrtc/jsepicecandidate.cc',
719 'app/webrtc/jsepicecandidate.h', 718 'app/webrtc/jsepicecandidate.h',
720 'app/webrtc/jsepsessiondescription.cc', 719 'app/webrtc/jsepsessiondescription.cc',
721 'app/webrtc/jsepsessiondescription.h', 720 'app/webrtc/jsepsessiondescription.h',
722 'app/webrtc/localaudiosource.cc', 721 'app/webrtc/localaudiosource.cc',
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
773 ], 772 ],
774 'conditions': [ 773 'conditions': [
775 ['OS=="android" and build_with_chromium==0', { 774 ['OS=="android" and build_with_chromium==0', {
776 'sources': [ 775 'sources': [
777 'app/webrtc/androidvideocapturer.h', 776 'app/webrtc/androidvideocapturer.h',
778 'app/webrtc/androidvideocapturer.cc', 777 'app/webrtc/androidvideocapturer.cc',
779 ], 778 ],
780 }], 779 }],
781 ], 780 ],
782 }, # target libjingle_peerconnection 781 }, # target libjingle_peerconnection
782 {
783 'target_name': 'libjingle_dtls',
784 'type': 'static_library',
785 'sources': [
786 'app/webrtc/dtlscertificate.cc',
787 'app/webrtc/dtlscertificate.h',
788 'app/webrtc/dtlsidentitystore.cc',
789 'app/webrtc/dtlsidentitystore.h',
790 ],
791 }, # target libjingle_dtls
783 ], 792 ],
784 } 793 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698