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

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

Issue 1715883002: Remove DeviceManager and DeviceInfo. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 9 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/engine/webrtcvoiceengine.cc ('k') | webrtc/media/media_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) 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', ],
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 'base/videocommon.h', 71 'base/videocommon.h',
72 'base/videoframe.cc', 72 'base/videoframe.cc',
73 'base/videoframe.h', 73 'base/videoframe.h',
74 'base/videoframefactory.cc', 74 'base/videoframefactory.cc',
75 'base/videoframefactory.h', 75 'base/videoframefactory.h',
76 'base/videorenderer.h', 76 'base/videorenderer.h',
77 'base/videosourcebase.cc', 77 'base/videosourcebase.cc',
78 'base/videosourcebase.h', 78 'base/videosourcebase.h',
79 'base/yuvframegenerator.cc', 79 'base/yuvframegenerator.cc',
80 'base/yuvframegenerator.h', 80 'base/yuvframegenerator.h',
81 'devices/deviceinfo.h',
82 'devices/videorendererfactory.h', 81 'devices/videorendererfactory.h',
83 'engine/nullwebrtcvideoengine.h', 82 'engine/nullwebrtcvideoengine.h',
84 'engine/simulcast.cc', 83 'engine/simulcast.cc',
85 'engine/simulcast.h', 84 'engine/simulcast.h',
86 'engine/webrtccommon.h', 85 'engine/webrtccommon.h',
87 'engine/webrtcmediaengine.cc', 86 'engine/webrtcmediaengine.cc',
88 'engine/webrtcmediaengine.h', 87 'engine/webrtcmediaengine.h',
89 'engine/webrtcmediaengine.cc', 88 'engine/webrtcmediaengine.cc',
90 'engine/webrtcvideocapturer.cc', 89 'engine/webrtcvideocapturer.cc',
91 'engine/webrtcvideocapturer.h', 90 'engine/webrtcvideocapturer.h',
(...skipping 24 matching lines...) Expand all
116 'cflags_cc!': [ 115 'cflags_cc!': [
117 '-Wnon-virtual-dtor', 116 '-Wnon-virtual-dtor',
118 '-Woverloaded-virtual', 117 '-Woverloaded-virtual',
119 ], 118 ],
120 'msvs_disabled_warnings': [ 119 'msvs_disabled_warnings': [
121 4245, # conversion from 'int' to 'size_t', signed/unsigned mismatch. 120 4245, # conversion from 'int' to 'size_t', signed/unsigned mismatch.
122 4267, # conversion from 'size_t' to 'int', possible loss of data. 121 4267, # conversion from 'size_t' to 'int', possible loss of data.
123 4389, # signed/unsigned mismatch. 122 4389, # signed/unsigned mismatch.
124 ], 123 ],
125 'conditions': [ 124 'conditions': [
126 ['include_internal_device_management==1', {
127 'sources': [
128 'devices/devicemanager.cc',
129 'devices/devicemanager.h',
130 ],
131 }, {
132 'sources': [
133 'devices/dummydevicemanager.cc',
134 'devices/dummydevicemanager.h',
135 ],
136 }],
137 ['build_libyuv==1', { 125 ['build_libyuv==1', {
138 'dependencies': ['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',], 126 'dependencies': ['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',],
139 }], 127 }],
140 ['build_usrsctp==1', { 128 ['build_usrsctp==1', {
141 'include_dirs': [ 129 'include_dirs': [
142 # TODO(jiayl): move this into the direct_dependent_settings of 130 # TODO(jiayl): move this into the direct_dependent_settings of
143 # usrsctp.gyp. 131 # usrsctp.gyp.
144 '<(DEPTH)/third_party/usrsctp/usrsctplib', 132 '<(DEPTH)/third_party/usrsctp/usrsctplib',
145 ], 133 ],
146 'dependencies': [ 134 'dependencies': [
(...skipping 18 matching lines...) Expand all
165 }, 153 },
166 'dependencies': [ 154 'dependencies': [
167 '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_im pl', 155 '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_im pl',
168 '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_imp l', 156 '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_imp l',
169 ], 157 ],
170 }], 158 }],
171 ['OS=="linux" and include_internal_device_management==1', { 159 ['OS=="linux" and include_internal_device_management==1', {
172 'sources': [ 160 'sources': [
173 'devices/libudevsymboltable.cc', 161 'devices/libudevsymboltable.cc',
174 'devices/libudevsymboltable.h', 162 'devices/libudevsymboltable.h',
175 'devices/linuxdeviceinfo.cc',
176 'devices/linuxdevicemanager.cc',
177 'devices/linuxdevicemanager.h',
178 'devices/v4llookup.cc', 163 'devices/v4llookup.cc',
179 'devices/v4llookup.h', 164 'devices/v4llookup.h',
180 ], 165 ],
181 'include_dirs': [ 166 'include_dirs': [
182 'third_party/libudev' 167 'third_party/libudev'
183 ], 168 ],
184 'libraries': [ 169 'libraries': [
185 '-lrt', 170 '-lrt',
186 ], 171 ],
187 }], 172 }],
(...skipping 14 matching lines...) Expand all
202 'msvs_settings': { 187 'msvs_settings': {
203 'VCLibrarianTool': { 188 'VCLibrarianTool': {
204 'AdditionalDependencies': [ 189 'AdditionalDependencies': [
205 'd3d9.lib', 190 'd3d9.lib',
206 'gdi32.lib', 191 'gdi32.lib',
207 'strmiids.lib', 192 'strmiids.lib',
208 ], 193 ],
209 }, 194 },
210 }, 195 },
211 }], 196 }],
212 ['OS=="win" and include_internal_device_management==1', {
213 'sources': [
214 'devices/win32deviceinfo.cc',
215 'devices/win32devicemanager.cc',
216 'devices/win32devicemanager.h',
217 ],
218 'msvs_settings': {
219 'VCLibrarianTool': {
220 'AdditionalDependencies': [
221 'winmm.lib',
222 ],
223 },
224 },
225 }],
226 ['OS=="mac" and include_internal_device_management==1', {
227 'sources': [
228 'devices/macdeviceinfo.cc',
229 'devices/macdevicemanager.cc',
230 'devices/macdevicemanager.h',
231 'devices/macdevicemanagermm.mm',
232 ],
233 'xcode_settings': {
234 'WARNING_CFLAGS': [
235 # TODO(perkj): Update macdevicemanager.cc to stop using
236 # deprecated functions and remove this flag.
237 '-Wno-deprecated-declarations',
238 ],
239 # Disable partial availability warning to prevent errors
240 # in macdevicemanagermm.mm using AVFoundation.
241 # https://code.google.com/p/webrtc/issues/detail?id=4695
242 'WARNING_CFLAGS!': ['-Wpartial-availability'],
243 },
244 'link_settings': {
245 'xcode_settings': {
246 'OTHER_LDFLAGS': [
247 '-weak_framework AVFoundation',
248 '-framework Cocoa',
249 '-framework CoreAudio',
250 '-framework CoreVideo',
251 '-framework OpenGL',
252 '-framework QTKit',
253 ],
254 },
255 },
256 }],
257 ['OS=="mac" and target_arch=="ia32"', { 197 ['OS=="mac" and target_arch=="ia32"', {
258 'sources': [ 198 'sources': [
259 'devices/carbonvideorenderer.cc', 199 'devices/carbonvideorenderer.cc',
260 'devices/carbonvideorenderer.h', 200 'devices/carbonvideorenderer.h',
261 ], 201 ],
262 'link_settings': { 202 'link_settings': {
263 'xcode_settings': { 203 'xcode_settings': {
264 'OTHER_LDFLAGS': [ 204 'OTHER_LDFLAGS': [
265 '-framework Carbon', 205 '-framework Carbon',
266 ], 206 ],
267 }, 207 },
268 }, 208 },
269 }], 209 }],
270 ['OS=="ios" and include_internal_device_management==1', {
271 'sources': [
272 'devices/mobiledevicemanager.cc',
273 ],
274 'include_dirs': [
275 # TODO(sjlee) Remove when vp8 is building for iOS. vp8 pulls in
276 # libjpeg which pulls in libyuv which currently disabled.
277 '../../third_party/libyuv/include',
278 ],
279 # TODO(kjellander): Make the code compile without disabling these.
280 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307
281 'cflags': [
282 '-Wno-unused-const-variable',
283 ],
284 'xcode_settings': {
285 'WARNING_CFLAGS': [
286 '-Wno-unused-const-variable',
287 ],
288 },
289 }],
290 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', { 210 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
291 'defines': [ 211 'defines': [
292 'CARBON_DEPRECATED=YES', 212 'CARBON_DEPRECATED=YES',
293 ], 213 ],
294 }], 214 }],
295 ['OS=="android" and include_internal_device_management==1', {
296 'sources': [
297 'devices/mobiledevicemanager.cc',
298 ],
299 }],
300 ], 215 ],
301 }, # target rtc_media 216 }, # target rtc_media
302 ], # targets. 217 ], # targets.
303 } 218 }
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvoiceengine.cc ('k') | webrtc/media/media_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698