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

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

Issue 1219333003: Targets should not depend on protobuf when enable_protobuf=0. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Do not define AcmDump::ParseAcmDump Created 5 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 'variables': { 10 'variables': {
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 { 81 {
82 'target_name': 'acm_dump_proto',
83 'type': 'static_library',
84 'sources': ['dump.proto',],
85 'variables': {
86 'proto_in_dir': '.',
87 # Workaround to protect against gyp's pathname relativization when
88 # this file is included by modules.gyp.
89 'proto_out_protected': 'webrtc/audio_coding',
90 'proto_out_dir': '<(proto_out_protected)',
91 },
92 'includes': ['../../../../build/protoc.gypi',],
93 },
94 {
95 'target_name': 'acm_dump', 82 'target_name': 'acm_dump',
96 'type': 'static_library', 83 'type': 'static_library',
97 'conditions': [ 84 'conditions': [
98 ['enable_protobuf==1', { 85 ['enable_protobuf==1', {
99 'defines': ['RTC_AUDIOCODING_DEBUG_DUMP'], 86 'defines': ['RTC_AUDIOCODING_DEBUG_DUMP'],
87 'dependencies': ['acm_dump_proto'],
100 } 88 }
101 ], 89 ],
102 ], 90 ],
103 'sources': [ 91 'sources': [
104 'acm_dump.h', 92 'acm_dump.h',
105 'acm_dump.cc' 93 'acm_dump.cc'
106 ], 94 ],
107 'dependencies': ['acm_dump_proto'],
108 }, 95 },
109 ], 96 ],
110 '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 }],
111 ['include_tests==1', { 115 ['include_tests==1', {
112 'targets': [ 116 'targets': [
113 { 117 {
114 'target_name': 'acm_receive_test', 118 'target_name': 'acm_receive_test',
115 'type': 'static_library', 119 'type': 'static_library',
116 'defines': [ 120 'defines': [
117 '<@(audio_coding_defines)', 121 '<@(audio_coding_defines)',
118 ], 122 ],
119 'dependencies': [ 123 'dependencies': [
120 '<@(audio_coding_dependencies)', 124 '<@(audio_coding_dependencies)',
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 'sources': [ 186 'sources': [
183 '../test/insert_packet_with_timing.cc', 187 '../test/insert_packet_with_timing.cc',
184 '../test/Channel.cc', 188 '../test/Channel.cc',
185 '../test/PCMFile.cc', 189 '../test/PCMFile.cc',
186 ], 190 ],
187 }, # delay_test 191 }, # delay_test
188 ], 192 ],
189 }], 193 }],
190 ], 194 ],
191 } 195 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698