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

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

Issue 1267683002: Hooked up RtcEventLog. It lives in Voice Engine and pointers are propagated to ACM and Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: All SetEventLog() functions have been removed, the pointer is now propagated through the constructo… Created 5 years, 4 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) 2011 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2011 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': [ 10 'includes': [
11 '../build/common.gypi', 11 '../build/common.gypi',
12 ], 12 ],
13 'targets': [ 13 'targets': [
14 { 14 {
15 'target_name': 'voice_engine', 15 'target_name': 'voice_engine',
16 'type': 'static_library', 16 'type': 'static_library',
17 'dependencies': [ 17 'dependencies': [
18 '<(webrtc_root)/common.gyp:webrtc_common', 18 '<(webrtc_root)/common.gyp:webrtc_common',
19 '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', 19 '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
20 '<(webrtc_root)/modules/modules.gyp:audio_coding_module', 20 '<(webrtc_root)/modules/modules.gyp:audio_coding_module',
21 '<(webrtc_root)/modules/modules.gyp:audio_conference_mixer', 21 '<(webrtc_root)/modules/modules.gyp:audio_conference_mixer',
22 '<(webrtc_root)/modules/modules.gyp:audio_device', 22 '<(webrtc_root)/modules/modules.gyp:audio_device',
23 '<(webrtc_root)/modules/modules.gyp:audio_processing', 23 '<(webrtc_root)/modules/modules.gyp:audio_processing',
24 '<(webrtc_root)/modules/modules.gyp:bitrate_controller', 24 '<(webrtc_root)/modules/modules.gyp:bitrate_controller',
25 '<(webrtc_root)/modules/modules.gyp:media_file', 25 '<(webrtc_root)/modules/modules.gyp:media_file',
26 '<(webrtc_root)/modules/modules.gyp:rtp_rtcp', 26 '<(webrtc_root)/modules/modules.gyp:rtp_rtcp',
27 '<(webrtc_root)/modules/modules.gyp:webrtc_utility', 27 '<(webrtc_root)/modules/modules.gyp:webrtc_utility',
28 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', 28 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
29 '<(webrtc_root)/webrtc.gyp:rtc_event_log',
29 ], 30 ],
30 'sources': [ 31 'sources': [
31 'include/voe_audio_processing.h', 32 'include/voe_audio_processing.h',
32 'include/voe_base.h', 33 'include/voe_base.h',
33 'include/voe_codec.h', 34 'include/voe_codec.h',
34 'include/voe_dtmf.h', 35 'include/voe_dtmf.h',
35 'include/voe_errors.h', 36 'include/voe_errors.h',
36 'include/voe_external_media.h', 37 'include/voe_external_media.h',
37 'include/voe_file.h', 38 'include/voe_file.h',
38 'include/voe_hardware.h', 39 'include/voe_hardware.h',
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 'target_name': 'voe_cmd_test', 218 'target_name': 'voe_cmd_test',
218 'type': 'executable', 219 'type': 'executable',
219 'dependencies': [ 220 'dependencies': [
220 'voice_engine', 221 'voice_engine',
221 '<(DEPTH)/testing/gtest.gyp:gtest', 222 '<(DEPTH)/testing/gtest.gyp:gtest',
222 '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', 223 '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
223 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers' , 224 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers' ,
224 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_ default', 225 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_ default',
225 '<(webrtc_root)/test/test.gyp:channel_transport', 226 '<(webrtc_root)/test/test.gyp:channel_transport',
226 '<(webrtc_root)/test/test.gyp:test_support', 227 '<(webrtc_root)/test/test.gyp:test_support',
228 '<(webrtc_root)/webrtc.gyp:rtc_event_log',
227 ], 229 ],
228 'sources': [ 230 'sources': [
229 'test/cmd_test/voe_cmd_test.cc', 231 'test/cmd_test/voe_cmd_test.cc',
230 ], 232 ],
231 }, 233 },
232 ], # targets 234 ], # targets
233 'conditions': [ 235 'conditions': [
234 ['OS=="android"', { 236 ['OS=="android"', {
235 'targets': [ 237 'targets': [
236 { 238 {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 'sources': [ 271 'sources': [
270 'voe_auto_test.isolate', 272 'voe_auto_test.isolate',
271 ], 273 ],
272 }, 274 },
273 ], 275 ],
274 }], 276 }],
275 ], # conditions 277 ], # conditions
276 }], # include_tests 278 }], # include_tests
277 ], # conditions 279 ], # conditions
278 } 280 }
OLDNEW
« webrtc/voice_engine/include/voe_codec.h ('K') | « webrtc/voice_engine/voe_codec_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698