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

Side by Side Diff: webrtc/webrtc.gyp

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) 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 unified diff | Download patch
« no previous file with comments | « webrtc/media/webrtc/webrtcvoiceengine_unittest.cc ('k') | webrtc/webrtc_examples.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 { 8 {
9 'conditions': [ 9 'conditions': [
10 ['include_tests==1', { 10 ['include_tests==1', {
11 'includes': [ 11 'includes': [
12 'libjingle/xmllite/xmllite_tests.gypi', 12 'libjingle/xmllite/xmllite_tests.gypi',
13 'libjingle/xmpp/xmpp_tests.gypi', 13 'libjingle/xmpp/xmpp_tests.gypi',
14 'media/media_tests.gypi',
14 'p2p/p2p_tests.gypi', 15 'p2p/p2p_tests.gypi',
15 'sound/sound_tests.gypi', 16 'sound/sound_tests.gypi',
16 'webrtc_tests.gypi', 17 'webrtc_tests.gypi',
17 ], 18 ],
18 }], 19 }],
19 ['enable_protobuf==1', { 20 ['enable_protobuf==1', {
20 'targets': [ 21 'targets': [
21 { 22 {
22 # This target should only be built if enable_protobuf is defined 23 # This target should only be built if enable_protobuf is defined
23 'target_name': 'rtc_event_log_proto', 24 'target_name': 'rtc_event_log_proto',
(...skipping 29 matching lines...) Expand all
53 'call/webrtc_call.gypi', 54 'call/webrtc_call.gypi',
54 'video/webrtc_video.gypi', 55 'video/webrtc_video.gypi',
55 ], 56 ],
56 'variables': { 57 'variables': {
57 'webrtc_all_dependencies': [ 58 'webrtc_all_dependencies': [
58 'base/base.gyp:*', 59 'base/base.gyp:*',
59 'sound/sound.gyp:*', 60 'sound/sound.gyp:*',
60 'common.gyp:*', 61 'common.gyp:*',
61 'common_audio/common_audio.gyp:*', 62 'common_audio/common_audio.gyp:*',
62 'common_video/common_video.gyp:*', 63 'common_video/common_video.gyp:*',
64 'media/media.gyp:*',
63 'modules/modules.gyp:*', 65 'modules/modules.gyp:*',
64 'p2p/p2p.gyp:*', 66 'p2p/p2p.gyp:*',
65 'system_wrappers/system_wrappers.gyp:*', 67 'system_wrappers/system_wrappers.gyp:*',
66 'tools/tools.gyp:*', 68 'tools/tools.gyp:*',
67 'voice_engine/voice_engine.gyp:*', 69 'voice_engine/voice_engine.gyp:*',
68 '<(webrtc_vp8_dir)/vp8.gyp:*', 70 '<(webrtc_vp8_dir)/vp8.gyp:*',
69 '<(webrtc_vp9_dir)/vp9.gyp:*', 71 '<(webrtc_vp9_dir)/vp9.gyp:*',
70 ], 72 ],
71 }, 73 },
72 'targets': [ 74 'targets': [
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 ], 155 ],
154 'defines': [ 156 'defines': [
155 'ENABLE_RTC_EVENT_LOG', 157 'ENABLE_RTC_EVENT_LOG',
156 ], 158 ],
157 }], 159 }],
158 ], 160 ],
159 }, 161 },
160 162
161 ], 163 ],
162 } 164 }
OLDNEW
« no previous file with comments | « webrtc/media/webrtc/webrtcvoiceengine_unittest.cc ('k') | webrtc/webrtc_examples.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698