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

Side by Side Diff: webrtc/modules/audio_device/audio_device.gypi

Issue 2103863004: UMA log for audio_device Init and Start(Playout|Recording). Make Init return a more specific error … (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix more silly errors. Created 4 years, 5 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) 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 { 9 {
10 'targets': [ 10 'targets': [
11 { 11 {
12 'target_name': 'audio_device', 12 'target_name': 'audio_device',
13 'type': 'static_library', 13 'type': 'static_library',
14 'dependencies': [ 14 'dependencies': [
15 'webrtc_utility', 15 'webrtc_utility',
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)/common_audio/common_audio.gyp:common_audio', 18 '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
19 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', 19 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_defa ult',
henrika_webrtc 2016/06/30 08:44:20 Why was this needed?
Max Morin WebRTC 2016/06/30 10:56:04 For linking with metrics. I made the dependencies
20 ], 20 ],
21 'include_dirs': [ 21 'include_dirs': [
22 '.', 22 '.',
23 '../include', 23 '../include',
24 'include', 24 'include',
25 'dummy', # Contains dummy audio device implementations. 25 'dummy', # Contains dummy audio device implementations.
26 ], 26 ],
27 'direct_dependent_settings': { 27 'direct_dependent_settings': {
28 'include_dirs': [ 28 'include_dirs': [
29 '../include', 29 '../include',
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 ['include_tests==1 and OS!="ios"', { 252 ['include_tests==1 and OS!="ios"', {
253 'targets': [ 253 'targets': [
254 { 254 {
255 'target_name': 'audio_device_tests', 255 'target_name': 'audio_device_tests',
256 'type': 'executable', 256 'type': 'executable',
257 'dependencies': [ 257 'dependencies': [
258 'audio_device', 258 'audio_device',
259 'webrtc_utility', 259 'webrtc_utility',
260 '<(webrtc_root)/test/test.gyp:test_support_main', 260 '<(webrtc_root)/test/test.gyp:test_support_main',
261 '<(DEPTH)/testing/gtest.gyp:gtest', 261 '<(DEPTH)/testing/gtest.gyp:gtest',
262 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers' , 262 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_ default',
263 ], 263 ],
264 'sources': [ 264 'sources': [
265 'test/audio_device_test_api.cc', 265 'test/audio_device_test_api.cc',
266 'test/audio_device_test_defines.h', 266 'test/audio_device_test_defines.h',
267 ], 267 ],
268 }, 268 },
269 { 269 {
270 'target_name': 'audio_device_test_func', 270 'target_name': 'audio_device_test_func',
271 'type': 'executable', 271 'type': 'executable',
272 'dependencies': [ 272 'dependencies': [
273 'audio_device', 273 'audio_device',
274 'webrtc_utility', 274 'webrtc_utility',
275 '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', 275 '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
276 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers' , 276 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_ default',
277 '<(webrtc_root)/test/test.gyp:test_support', 277 '<(webrtc_root)/test/test.gyp:test_support',
278 '<(DEPTH)/testing/gtest.gyp:gtest', 278 '<(DEPTH)/testing/gtest.gyp:gtest',
279 ], 279 ],
280 'sources': [ 280 'sources': [
281 'test/audio_device_test_func.cc', 281 'test/audio_device_test_func.cc',
282 'test/audio_device_test_defines.h', 282 'test/audio_device_test_defines.h',
283 'test/func_test_manager.cc', 283 'test/func_test_manager.cc',
284 'test/func_test_manager.h', 284 'test/func_test_manager.h',
285 ], 285 ],
286 }, 286 },
287 ], # targets 287 ], # targets
288 }], # include_tests==1 and OS!=ios 288 }], # include_tests==1 and OS!=ios
289 ], 289 ],
290 } 290 }
291 291
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698