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

Side by Side Diff: webrtc/media/media.gyp

Issue 1923613003: Revert of Delete video_render module. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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/api/java/jni/peerconnection_jni.cc ('k') | webrtc/modules/modules.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) 2016 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2016 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 { 9 {
10 'includes': [ '../build/common.gypi', ], 10 'includes': [ '../build/common.gypi', ],
11 'targets': [ 11 'targets': [
12 { 12 {
13 'target_name': 'rtc_media', 13 'target_name': 'rtc_media',
14 'type': 'static_library', 14 'type': 'static_library',
15 'dependencies': [ 15 'dependencies': [
16 '<(webrtc_root)/base/base.gyp:rtc_base_approved', 16 '<(webrtc_root)/base/base.gyp:rtc_base_approved',
17 '<(webrtc_root)/common.gyp:webrtc_common', 17 '<(webrtc_root)/common.gyp:webrtc_common',
18 '<(webrtc_root)/modules/modules.gyp:video_render_module',
18 '<(webrtc_root)/webrtc.gyp:webrtc', 19 '<(webrtc_root)/webrtc.gyp:webrtc',
19 '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine', 20 '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine',
20 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default', 21 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
21 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', 22 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
22 '<(webrtc_root)/libjingle/xmllite/xmllite.gyp:rtc_xmllite', 23 '<(webrtc_root)/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
23 '<(webrtc_root)/libjingle/xmpp/xmpp.gyp:rtc_xmpp', 24 '<(webrtc_root)/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
24 '<(webrtc_root)/p2p/p2p.gyp:rtc_p2p', 25 '<(webrtc_root)/p2p/p2p.gyp:rtc_p2p',
25 ], 26 ],
26 'direct_dependent_settings': { 27 'direct_dependent_settings': {
27 'include_dirs': [ 28 'include_dirs': [
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 # usrsctp.gyp. 126 # usrsctp.gyp.
126 '<(DEPTH)/third_party/usrsctp/usrsctplib', 127 '<(DEPTH)/third_party/usrsctp/usrsctplib',
127 ], 128 ],
128 'dependencies': [ 129 'dependencies': [
129 '<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib', 130 '<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib',
130 ], 131 ],
131 }], 132 }],
132 ['build_with_chromium==1', { 133 ['build_with_chromium==1', {
133 'dependencies': [ 134 'dependencies': [
134 '<(webrtc_root)/modules/modules.gyp:video_capture', 135 '<(webrtc_root)/modules/modules.gyp:video_capture',
136 '<(webrtc_root)/modules/modules.gyp:video_render',
135 ], 137 ],
136 }, { 138 }, {
137 'defines': [ 139 'defines': [
138 'HAVE_WEBRTC_VIDEO', 140 'HAVE_WEBRTC_VIDEO',
139 'HAVE_WEBRTC_VOICE', 141 'HAVE_WEBRTC_VOICE',
140 ], 142 ],
141 'direct_dependent_settings': { 143 'direct_dependent_settings': {
142 'defines': [ 144 'defines': [
143 'HAVE_WEBRTC_VIDEO', 145 'HAVE_WEBRTC_VIDEO',
144 'HAVE_WEBRTC_VOICE', 146 'HAVE_WEBRTC_VOICE',
145 ], 147 ],
146 }, 148 },
147 'dependencies': [ 149 'dependencies': [
148 '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_im pl', 150 '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_im pl',
151 '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_imp l',
149 ], 152 ],
150 }], 153 }],
151 ['OS=="linux" and use_gtk==1', { 154 ['OS=="linux" and use_gtk==1', {
152 'sources': [ 155 'sources': [
153 'devices/gtkvideorenderer.cc', 156 'devices/gtkvideorenderer.cc',
154 'devices/gtkvideorenderer.h', 157 'devices/gtkvideorenderer.h',
155 ], 158 ],
156 'cflags': [ 159 'cflags': [
157 '<!@(pkg-config --cflags gobject-2.0 gthread-2.0 gtk+-2.0)', 160 '<!@(pkg-config --cflags gobject-2.0 gthread-2.0 gtk+-2.0)',
158 ], 161 ],
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 'sources': [ 368 'sources': [
366 'rtc_media_unittests.isolate', 369 'rtc_media_unittests.isolate',
367 ], 370 ],
368 }, 371 },
369 ], 372 ],
370 }], 373 }],
371 ], # conditions 374 ], # conditions
372 }], # include_tests==1 375 }], # include_tests==1
373 ], # conditions 376 ], # conditions
374 } 377 }
OLDNEW
« no previous file with comments | « webrtc/api/java/jni/peerconnection_jni.cc ('k') | webrtc/modules/modules.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698