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

Side by Side Diff: webrtc/modules/audio_coding/neteq/neteq.gypi

Issue 1336923002: Remove the preprocessor symbol WEBRTC_CODEC_PCM16 (it was always defined) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 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 | « webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc ('k') | 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 'variables': { 10 'variables': {
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 '<(DEPTH)/testing/gtest.gyp:gtest', 125 '<(DEPTH)/testing/gtest.gyp:gtest',
126 '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', 126 '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
127 '<(webrtc_root)/test/test.gyp:test_support_main', 127 '<(webrtc_root)/test/test.gyp:test_support_main',
128 ], 128 ],
129 'defines': [ 129 'defines': [
130 'AUDIO_DECODER_UNITTEST', 130 'AUDIO_DECODER_UNITTEST',
131 'WEBRTC_CODEC_G722', 131 'WEBRTC_CODEC_G722',
132 'WEBRTC_CODEC_ILBC', 132 'WEBRTC_CODEC_ILBC',
133 'WEBRTC_CODEC_ISACFX', 133 'WEBRTC_CODEC_ISACFX',
134 'WEBRTC_CODEC_ISAC', 134 'WEBRTC_CODEC_ISAC',
135 'WEBRTC_CODEC_PCM16',
136 '<@(neteq_defines)', 135 '<@(neteq_defines)',
137 ], 136 ],
138 'sources': [ 137 'sources': [
139 'audio_decoder_impl.cc', 138 'audio_decoder_impl.cc',
140 'audio_decoder_impl.h', 139 'audio_decoder_impl.h',
141 'audio_decoder_unittest.cc', 140 'audio_decoder_unittest.cc',
142 ], 141 ],
143 'conditions': [ 142 'conditions': [
144 ['OS=="android"', { 143 ['OS=="android"', {
145 'dependencies': [ 144 'dependencies': [
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 'sources': [ 213 'sources': [
215 'audio_decoder_unittests.isolate', 214 'audio_decoder_unittests.isolate',
216 ], 215 ],
217 }, 216 },
218 ], 217 ],
219 }], 218 }],
220 ], 219 ],
221 }], # include_tests 220 }], # include_tests
222 ], # conditions 221 ], # conditions
223 } 222 }
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698