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

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

Powered by Google App Engine
This is Rietveld 408576698