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

Side by Side Diff: webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi

Issue 1250383003: Revert "Renamed the ACMDump to RtcEventLog and moved it to webrtc/video, since it is not specific t… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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) 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 'variables': { 10 'variables': {
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 'codec_manager.cc', 71 'codec_manager.cc',
72 'codec_manager.h', 72 'codec_manager.h',
73 'codec_owner.cc', 73 'codec_owner.cc',
74 'codec_owner.h', 74 'codec_owner.h',
75 'initial_delay_manager.cc', 75 'initial_delay_manager.cc',
76 'initial_delay_manager.h', 76 'initial_delay_manager.h',
77 'nack.cc', 77 'nack.cc',
78 'nack.h', 78 'nack.h',
79 ], 79 ],
80 }, 80 },
81 {
82 'target_name': 'acm_dump',
83 'type': 'static_library',
84 'conditions': [
85 ['enable_protobuf==1', {
86 'defines': ['RTC_AUDIOCODING_DEBUG_DUMP'],
87 'dependencies': ['acm_dump_proto'],
88 }
89 ],
90 ],
91 'sources': [
92 'acm_dump.h',
93 'acm_dump.cc'
94 ],
95 },
81 ], 96 ],
82 'conditions': [ 97 'conditions': [
98 ['enable_protobuf==1', {
99 'targets': [
100 {
101 'target_name': 'acm_dump_proto',
102 'type': 'static_library',
103 'sources': ['dump.proto',],
104 'variables': {
105 'proto_in_dir': '.',
106 # Workaround to protect against gyp's pathname relativization when
107 # this file is included by modules.gyp.
108 'proto_out_protected': 'webrtc/audio_coding',
109 'proto_out_dir': '<(proto_out_protected)',
110 },
111 'includes': ['../../../../build/protoc.gypi',],
112 },
113 ]
114 }],
83 ['include_tests==1', { 115 ['include_tests==1', {
84 'targets': [ 116 'targets': [
85 { 117 {
86 'target_name': 'acm_receive_test', 118 'target_name': 'acm_receive_test',
87 'type': 'static_library', 119 'type': 'static_library',
88 'defines': [ 120 'defines': [
89 '<@(audio_coding_defines)', 121 '<@(audio_coding_defines)',
90 ], 122 ],
91 'dependencies': [ 123 'dependencies': [
92 '<@(audio_coding_dependencies)', 124 '<@(audio_coding_dependencies)',
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 'sources': [ 186 'sources': [
155 '../test/insert_packet_with_timing.cc', 187 '../test/insert_packet_with_timing.cc',
156 '../test/Channel.cc', 188 '../test/Channel.cc',
157 '../test/PCMFile.cc', 189 '../test/PCMFile.cc',
158 ], 190 ],
159 }, # delay_test 191 }, # delay_test
160 ], 192 ],
161 }], 193 }],
162 ], 194 ],
163 } 195 }
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/main/acm2/acm_dump_unittest.cc ('k') | webrtc/modules/audio_coding/main/acm2/dump.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698