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

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

Issue 2338813002: Remove dependency of audio_device on metrics_default. (Closed)
Patch Set: Created 4 years, 3 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 | « no previous file | no next file » | 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 { 9 {
10 'targets': [ 10 'targets': [
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 # Don't link these into Chrome since they contain static data. 82 # Don't link these into Chrome since they contain static data.
83 'dummy/file_audio_device_factory.cc', 83 'dummy/file_audio_device_factory.cc',
84 'dummy/file_audio_device_factory.h', 84 'dummy/file_audio_device_factory.h',
85 ], 85 ],
86 }], 86 }],
87 ['include_internal_audio_device==1', { 87 ['include_internal_audio_device==1', {
88 'sources': [ 88 'sources': [
89 'audio_device_impl.cc', 89 'audio_device_impl.cc',
90 'audio_device_impl.h', 90 'audio_device_impl.h',
91 ], 91 ],
92 'dependencies': [
93 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default' ,
94 ],
95 'conditions': [ 92 'conditions': [
96 ['use_dummy_audio_file_devices==1', { 93 ['use_dummy_audio_file_devices==1', {
97 'defines': [ 94 'defines': [
98 'WEBRTC_DUMMY_FILE_DEVICES', 95 'WEBRTC_DUMMY_FILE_DEVICES',
99 ], 96 ],
100 }, { # use_dummy_audio_file_devices==0, so use a platform device. 97 }, { # use_dummy_audio_file_devices==0, so use a platform device.
101 'conditions': [ 98 'conditions': [
102 ['OS=="android"', { 99 ['OS=="android"', {
103 'sources': [ 100 'sources': [
104 'android/audio_device_template.h', 101 'android/audio_device_template.h',
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 'targets': [ 261 'targets': [
265 { 262 {
266 'target_name': 'audio_device_tests', 263 'target_name': 'audio_device_tests',
267 'type': 'executable', 264 'type': 'executable',
268 'dependencies': [ 265 'dependencies': [
269 'audio_device', 266 'audio_device',
270 'webrtc_utility', 267 'webrtc_utility',
271 '<(webrtc_root)/test/test.gyp:test_support_main', 268 '<(webrtc_root)/test/test.gyp:test_support_main',
272 '<(DEPTH)/testing/gtest.gyp:gtest', 269 '<(DEPTH)/testing/gtest.gyp:gtest',
273 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers' , 270 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers' ,
271 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default' ,
274 ], 272 ],
275 'sources': [ 273 'sources': [
276 'test/audio_device_test_api.cc', 274 'test/audio_device_test_api.cc',
277 'test/audio_device_test_defines.h', 275 'test/audio_device_test_defines.h',
278 ], 276 ],
279 }, 277 },
280 ], # targets 278 ], # targets
281 }], # include_tests==1 and OS!=ios 279 }], # include_tests==1 and OS!=ios
282 ], 280 ],
283 } 281 }
284 282
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698