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

Side by Side Diff: webrtc/webrtc.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/video/webrtc_video.gypi ('k') | webrtc/webrtc_tests.gypi » ('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 'variables': { 9 'variables': {
10 'webrtc_all_dependencies': [ 10 'webrtc_all_dependencies': [
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 '<@(webrtc_call_dependencies)', 123 '<@(webrtc_call_dependencies)',
124 '<@(webrtc_video_dependencies)', 124 '<@(webrtc_video_dependencies)',
125 'rtc_event_log', 125 'rtc_event_log',
126 ], 126 ],
127 'conditions': [ 127 'conditions': [
128 # TODO(andresp): Chromium should link directly with this and no if 128 # TODO(andresp): Chromium should link directly with this and no if
129 # conditions should be needed on webrtc build files. 129 # conditions should be needed on webrtc build files.
130 ['build_with_chromium==1', { 130 ['build_with_chromium==1', {
131 'dependencies': [ 131 'dependencies': [
132 '<(webrtc_root)/modules/modules.gyp:video_capture', 132 '<(webrtc_root)/modules/modules.gyp:video_capture',
133 '<(webrtc_root)/modules/modules.gyp:video_render',
133 ], 134 ],
134 }], 135 }],
135 ], 136 ],
136 }, 137 },
137 { 138 {
138 'target_name': 'rtc_event_log', 139 'target_name': 'rtc_event_log',
139 'type': 'static_library', 140 'type': 'static_library',
140 'sources': [ 141 'sources': [
141 'call/rtc_event_log.cc', 142 'call/rtc_event_log.cc',
142 'call/rtc_event_log.h', 143 'call/rtc_event_log.h',
143 'call/rtc_event_log_helper_thread.cc', 144 'call/rtc_event_log_helper_thread.cc',
144 'call/rtc_event_log_helper_thread.h', 145 'call/rtc_event_log_helper_thread.h',
145 ], 146 ],
146 'conditions': [ 147 'conditions': [
147 # If enable_protobuf is defined, we want to compile the protobuf 148 # If enable_protobuf is defined, we want to compile the protobuf
148 # and add rtc_event_log.pb.h and rtc_event_log.pb.cc to the sources. 149 # and add rtc_event_log.pb.h and rtc_event_log.pb.cc to the sources.
149 ['enable_protobuf==1', { 150 ['enable_protobuf==1', {
150 'dependencies': [ 151 'dependencies': [
151 'rtc_event_log_proto', 152 'rtc_event_log_proto',
152 ], 153 ],
153 'defines': [ 154 'defines': [
154 'ENABLE_RTC_EVENT_LOG', 155 'ENABLE_RTC_EVENT_LOG',
155 ], 156 ],
156 }], 157 }],
157 ], 158 ],
158 }, 159 },
159 160
160 ], 161 ],
161 } 162 }
OLDNEW
« no previous file with comments | « webrtc/video/webrtc_video.gypi ('k') | webrtc/webrtc_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698