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

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

Issue 1262333002: Move audio_coding_module.gypi from main/acm2 to main/. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase 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
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi » ('j') | 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) 2015 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2015 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 'codecs/interfaces.gypi', 12 'codecs/interfaces.gypi',
13 'codecs/cng/cng.gypi', 13 'codecs/cng/cng.gypi',
14 'codecs/g711/g711.gypi', 14 'codecs/g711/g711.gypi',
15 'codecs/g722/g722.gypi', 15 'codecs/g722/g722.gypi',
16 'codecs/ilbc/ilbc.gypi', 16 'codecs/ilbc/ilbc.gypi',
17 'codecs/isac/isac.gypi', 17 'codecs/isac/isac.gypi',
18 'codecs/isac/isacfix.gypi', 18 'codecs/isac/isacfix.gypi',
19 'codecs/pcm16b/pcm16b.gypi', 19 'codecs/pcm16b/pcm16b.gypi',
20 'codecs/red/red.gypi', 20 'codecs/red/red.gypi',
21 'main/acm2/audio_coding_module.gypi', 21 'main/audio_coding_module.gypi',
22 'neteq/neteq.gypi', 22 'neteq/neteq.gypi',
23 ], 23 ],
24 'conditions': [ 24 'conditions': [
25 ['include_opus==1', { 25 ['include_opus==1', {
26 'includes': ['codecs/opus/opus.gypi',], 26 'includes': ['codecs/opus/opus.gypi',],
27 }], 27 }],
28 ], 28 ],
29 } 29 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698