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

Side by Side Diff: webrtc/modules/modules.gyp

Issue 1319713004: Merge two files with AudioEncoderOpus tests (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: windows compile fix 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/codecs/opus/audio_encoder_opus_unittest.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) 2011 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2011 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 '<(webrtc_root)/modules/video_coding/codecs/vp8/vp8.gyp:webrtc_vp8', 90 '<(webrtc_root)/modules/video_coding/codecs/vp8/vp8.gyp:webrtc_vp8',
91 '<(webrtc_root)/modules/video_coding/codecs/vp9/vp9.gyp:webrtc_vp9', 91 '<(webrtc_root)/modules/video_coding/codecs/vp9/vp9.gyp:webrtc_vp9',
92 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers' , 92 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers' ,
93 '<(webrtc_root)/test/test.gyp:frame_generator', 93 '<(webrtc_root)/test/test.gyp:frame_generator',
94 '<(webrtc_root)/test/test.gyp:rtp_test_utils', 94 '<(webrtc_root)/test/test.gyp:rtp_test_utils',
95 '<(webrtc_root)/test/test.gyp:test_support_main', 95 '<(webrtc_root)/test/test.gyp:test_support_main',
96 '<(webrtc_root)/tools/tools.gyp:agc_test_utils', 96 '<(webrtc_root)/tools/tools.gyp:agc_test_utils',
97 ], 97 ],
98 'sources': [ 98 'sources': [
99 'audio_coding/codecs/cng/audio_encoder_cng_unittest.cc', 99 'audio_coding/codecs/cng/audio_encoder_cng_unittest.cc',
100 'audio_coding/codecs/opus/audio_encoder_mutable_opus_test.cc',
101 'audio_coding/main/acm2/acm_receiver_unittest.cc', 100 'audio_coding/main/acm2/acm_receiver_unittest.cc',
102 'audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc', 101 'audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc',
103 'audio_coding/main/acm2/audio_coding_module_unittest.cc', 102 'audio_coding/main/acm2/audio_coding_module_unittest.cc',
104 'audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc', 103 'audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc',
105 'audio_coding/main/acm2/call_statistics_unittest.cc', 104 'audio_coding/main/acm2/call_statistics_unittest.cc',
106 'audio_coding/main/acm2/codec_owner_unittest.cc', 105 'audio_coding/main/acm2/codec_owner_unittest.cc',
107 'audio_coding/main/acm2/initial_delay_manager_unittest.cc', 106 'audio_coding/main/acm2/initial_delay_manager_unittest.cc',
108 'audio_coding/main/acm2/nack_unittest.cc', 107 'audio_coding/main/acm2/nack_unittest.cc',
109 'audio_coding/codecs/cng/cng_unittest.cc', 108 'audio_coding/codecs/cng/cng_unittest.cc',
110 'audio_coding/codecs/isac/fix/source/filters_unittest.cc', 109 'audio_coding/codecs/isac/fix/source/filters_unittest.cc',
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 'sources': [ 490 'sources': [
492 'modules_unittests.isolate', 491 'modules_unittests.isolate',
493 ], 492 ],
494 }, 493 },
495 ], 494 ],
496 }], 495 }],
497 ], 496 ],
498 }], # include_tests 497 }], # include_tests
499 ], # conditions 498 ], # conditions
500 } 499 }
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698