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

Side by Side Diff: talk/libjingle.gyp

Issue 1586563003: Revert of Use an explicit identifier in Config (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
677 'conditions': [ 677 'conditions': [
678 ['build_libsrtp==1', { 678 ['build_libsrtp==1', {
679 'dependencies': [ 679 'dependencies': [
680 '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp', 680 '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
681 ], 681 ],
682 }], 682 }],
683 ], 683 ],
684 'include_dirs': [ 684 'include_dirs': [
685 '<(DEPTH)/testing/gtest/include', 685 '<(DEPTH)/testing/gtest/include',
686 ], 686 ],
687 'include_dirs!': [
688 '<(DEPTH)/webrtc',
689 ],
690 'direct_dependent_settings': { 687 'direct_dependent_settings': {
691 'include_dirs': [ 688 'include_dirs': [
692 '<(DEPTH)/testing/gtest/include', 689 '<(DEPTH)/testing/gtest/include',
693 ], 690 ],
694 'include_dirs!': [
695 '<(DEPTH)/webrtc',
696 ],
697 }, 691 },
698 'sources': [ 692 'sources': [
699 'session/media/audiomonitor.cc', 693 'session/media/audiomonitor.cc',
700 'session/media/audiomonitor.h', 694 'session/media/audiomonitor.h',
701 'session/media/bundlefilter.cc', 695 'session/media/bundlefilter.cc',
702 'session/media/bundlefilter.h', 696 'session/media/bundlefilter.h',
703 'session/media/channel.cc', 697 'session/media/channel.cc',
704 'session/media/channel.h', 698 'session/media/channel.h',
705 'session/media/channelmanager.cc', 699 'session/media/channelmanager.cc',
706 'session/media/channelmanager.h', 700 'session/media/channelmanager.h',
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
805 ['OS=="android" and build_with_chromium==0', { 799 ['OS=="android" and build_with_chromium==0', {
806 'sources': [ 800 'sources': [
807 'app/webrtc/androidvideocapturer.h', 801 'app/webrtc/androidvideocapturer.h',
808 'app/webrtc/androidvideocapturer.cc', 802 'app/webrtc/androidvideocapturer.cc',
809 ], 803 ],
810 }], 804 }],
811 ], 805 ],
812 }, # target libjingle_peerconnection 806 }, # target libjingle_peerconnection
813 ], 807 ],
814 } 808 }
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