Chromium Code Reviews| OLD | NEW |
|---|---|
| 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': [ |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 80 ], | 80 ], |
| 81 'direct_dependent_settings': { | 81 'direct_dependent_settings': { |
| 82 'include_dirs': [ | 82 'include_dirs': [ |
| 83 '<(webrtc_root)', | 83 '<(webrtc_root)', |
| 84 ], | 84 ], |
| 85 }, | 85 }, |
| 86 'sources': [ | 86 'sources': [ |
| 87 'codecs/audio_decoder_factory.h', | 87 'codecs/audio_decoder_factory.h', |
| 88 'codecs/audio_format.cc', | 88 'codecs/audio_format.cc', |
| 89 'codecs/audio_format.h', | 89 'codecs/audio_format.h', |
| 90 'codecs/audio_format_conversion.cc', | |
|
kjellander_webrtc
2016/11/02 06:37:53
Can we make the same changes here as in the GN bui
kwiberg-webrtc
2016/11/02 10:25:27
This won't be needed if https://codereview.webrtc.
| |
| 91 'codecs/audio_format_conversion.h', | |
| 90 ], | 92 ], |
| 91 }, | 93 }, |
| 92 { | 94 { |
| 93 'target_name': 'builtin_audio_decoder_factory', | 95 'target_name': 'builtin_audio_decoder_factory', |
| 94 'type': 'static_library', | 96 'type': 'static_library', |
| 95 'defines': [ | 97 'defines': [ |
| 96 '<@(audio_codec_defines)', | 98 '<@(audio_codec_defines)', |
| 97 ], | 99 ], |
| 98 'dependencies': [ | 100 'dependencies': [ |
| 99 '<(webrtc_root)/common.gyp:webrtc_common', | 101 '<(webrtc_root)/common.gyp:webrtc_common', |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 184 'include/audio_coding_module_typedefs.h', | 186 'include/audio_coding_module_typedefs.h', |
| 185 ], | 187 ], |
| 186 }, | 188 }, |
| 187 ], | 189 ], |
| 188 'conditions': [ | 190 'conditions': [ |
| 189 ['include_opus==1', { | 191 ['include_opus==1', { |
| 190 'includes': ['codecs/opus/opus.gypi',], | 192 'includes': ['codecs/opus/opus.gypi',], |
| 191 }], | 193 }], |
| 192 ], | 194 ], |
| 193 } | 195 } |
| OLD | NEW |