| OLD | NEW | 
|---|
| 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': { | 
| 11     'codecs': [ | 11     'codecs': [ | 
| 12       'cng', | 12       'cng', | 
| 13       'g711', | 13       'g711', | 
| 14       'g722', |  | 
| 15       'ilbc', |  | 
| 16       'isac', |  | 
| 17       'isac_fix', |  | 
| 18       'pcm16b', | 14       'pcm16b', | 
| 19     ], | 15     ], | 
| 20     'neteq_defines': [], | 16     'neteq_defines': [], | 
| 21     'conditions': [ | 17     'conditions': [ | 
| 22       ['include_opus==1', { | 18       ['include_opus==1', { | 
| 23         'codecs': ['webrtc_opus',], | 19         'codecs': ['webrtc_opus',], | 
| 24         'neteq_defines': ['WEBRTC_CODEC_OPUS',], | 20         'neteq_defines': ['WEBRTC_CODEC_OPUS',], | 
| 25       }], | 21       }], | 
|  | 22       ['build_with_mozilla==0', { | 
|  | 23         'conditions': [ | 
|  | 24           ['target_arch=="arm"', { | 
|  | 25             'codecs': ['isac_fix',], | 
|  | 26             'neteq_defines': ['WEBRTC_CODEC_ISACFX',], | 
|  | 27           }, { | 
|  | 28             'codecs': ['isac',], | 
|  | 29             'neteq_defines': ['WEBRTC_CODEC_ISAC',], | 
|  | 30           }], | 
|  | 31         ], | 
|  | 32         'codecs': ['g722',], | 
|  | 33         'neteq_defines': ['WEBRTC_CODEC_G722',], | 
|  | 34       }], | 
|  | 35       ['build_with_mozilla==0 and build_with_chromium==0', { | 
|  | 36         'codecs': ['ilbc',], | 
|  | 37         'neteq_defines': ['WEBRTC_CODEC_ILBC',], | 
|  | 38       }], | 
| 26     ], | 39     ], | 
| 27     'neteq_dependencies': [ | 40     'neteq_dependencies': [ | 
| 28       '<@(codecs)', | 41       '<@(codecs)', | 
| 29       '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', | 42       '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', | 
| 30       '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', | 43       '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', | 
| 31       'audio_decoder_interface', | 44       'audio_decoder_interface', | 
| 32     ], | 45     ], | 
| 33   }, | 46   }, | 
| 34   'targets': [ | 47   'targets': [ | 
| 35     { | 48     { | 
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 113   ], # targets | 126   ], # targets | 
| 114   'conditions': [ | 127   'conditions': [ | 
| 115     ['include_tests==1', { | 128     ['include_tests==1', { | 
| 116       'includes': ['neteq_tests.gypi',], | 129       'includes': ['neteq_tests.gypi',], | 
| 117       'targets': [ | 130       'targets': [ | 
| 118         { | 131         { | 
| 119           'target_name': 'audio_decoder_unittests', | 132           'target_name': 'audio_decoder_unittests', | 
| 120           'type': '<(gtest_target_type)', | 133           'type': '<(gtest_target_type)', | 
| 121           'dependencies': [ | 134           'dependencies': [ | 
| 122             '<@(codecs)', | 135             '<@(codecs)', | 
|  | 136             'g722', | 
|  | 137             'ilbc', | 
|  | 138             'isac', | 
|  | 139             'isac_fix', | 
| 123             'audio_decoder_interface', | 140             'audio_decoder_interface', | 
| 124             'neteq_unittest_tools', | 141             'neteq_unittest_tools', | 
| 125             '<(DEPTH)/testing/gtest.gyp:gtest', | 142             '<(DEPTH)/testing/gtest.gyp:gtest', | 
| 126             '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', | 143             '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', | 
| 127             '<(webrtc_root)/test/test.gyp:test_support_main', | 144             '<(webrtc_root)/test/test.gyp:test_support_main', | 
| 128           ], | 145           ], | 
| 129           'defines': [ | 146           'defines': [ | 
| 130             'AUDIO_DECODER_UNITTEST', |  | 
| 131             'WEBRTC_CODEC_G722', |  | 
| 132             'WEBRTC_CODEC_ILBC', |  | 
| 133             'WEBRTC_CODEC_ISACFX', |  | 
| 134             'WEBRTC_CODEC_ISAC', |  | 
| 135             '<@(neteq_defines)', | 147             '<@(neteq_defines)', | 
| 136           ], | 148           ], | 
| 137           'sources': [ | 149           'sources': [ | 
| 138             'audio_decoder_impl.cc', | 150             'audio_decoder_impl.cc', | 
| 139             'audio_decoder_impl.h', | 151             'audio_decoder_impl.h', | 
| 140             'audio_decoder_unittest.cc', | 152             'audio_decoder_unittest.cc', | 
| 141           ], | 153           ], | 
| 142           'conditions': [ | 154           'conditions': [ | 
| 143             ['OS=="android"', { | 155             ['OS=="android"', { | 
| 144               'dependencies': [ | 156               'dependencies': [ | 
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 213               'sources': [ | 225               'sources': [ | 
| 214                 'audio_decoder_unittests.isolate', | 226                 'audio_decoder_unittests.isolate', | 
| 215               ], | 227               ], | 
| 216             }, | 228             }, | 
| 217           ], | 229           ], | 
| 218         }], | 230         }], | 
| 219       ], | 231       ], | 
| 220     }], # include_tests | 232     }], # include_tests | 
| 221   ], # conditions | 233   ], # conditions | 
| 222 } | 234 } | 
| OLD | NEW | 
|---|