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

Side by Side Diff: talk/libjingle.gyp

Issue 1589573004: Re-land: "Use an explicit identifier in Config" (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix error in Chrome Created 4 years, 11 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
« no previous file with comments | « no previous file | webrtc/BUILD.gn » ('j') | 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 694 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 'conditions': [ 705 'conditions': [
706 ['build_libsrtp==1', { 706 ['build_libsrtp==1', {
707 'dependencies': [ 707 'dependencies': [
708 '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp', 708 '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
709 ], 709 ],
710 }], 710 }],
711 ], 711 ],
712 'include_dirs': [ 712 'include_dirs': [
713 '<(DEPTH)/testing/gtest/include', 713 '<(DEPTH)/testing/gtest/include',
714 ], 714 ],
715 'include_dirs!': [
716 '<(DEPTH)/webrtc',
717 ],
715 'direct_dependent_settings': { 718 'direct_dependent_settings': {
716 'include_dirs': [ 719 'include_dirs': [
717 '<(DEPTH)/testing/gtest/include', 720 '<(DEPTH)/testing/gtest/include',
718 ], 721 ],
722 'include_dirs!': [
723 '<(DEPTH)/webrtc',
724 ],
719 }, 725 },
720 'sources': [ 726 'sources': [
721 'session/media/audiomonitor.cc', 727 'session/media/audiomonitor.cc',
722 'session/media/audiomonitor.h', 728 'session/media/audiomonitor.h',
723 'session/media/bundlefilter.cc', 729 'session/media/bundlefilter.cc',
724 'session/media/bundlefilter.h', 730 'session/media/bundlefilter.h',
725 'session/media/channel.cc', 731 'session/media/channel.cc',
726 'session/media/channel.h', 732 'session/media/channel.h',
727 'session/media/channelmanager.cc', 733 'session/media/channelmanager.cc',
728 'session/media/channelmanager.h', 734 'session/media/channelmanager.h',
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 'app/webrtc/webrtcsdp.cc', 822 'app/webrtc/webrtcsdp.cc',
817 'app/webrtc/webrtcsdp.h', 823 'app/webrtc/webrtcsdp.h',
818 'app/webrtc/webrtcsession.cc', 824 'app/webrtc/webrtcsession.cc',
819 'app/webrtc/webrtcsession.h', 825 'app/webrtc/webrtcsession.h',
820 'app/webrtc/webrtcsessiondescriptionfactory.cc', 826 'app/webrtc/webrtcsessiondescriptionfactory.cc',
821 'app/webrtc/webrtcsessiondescriptionfactory.h', 827 'app/webrtc/webrtcsessiondescriptionfactory.h',
822 ], 828 ],
823 }, # target libjingle_peerconnection 829 }, # target libjingle_peerconnection
824 ], 830 ],
825 } 831 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698