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

Unified Diff: webrtc/video_engine/video_engine_core_unittests.gyp

Issue 1184763009: Merge video_engine_core into webrtc target. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/video_engine/video_engine_core.gypi ('k') | webrtc/webrtc.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video_engine/video_engine_core_unittests.gyp
diff --git a/webrtc/modules/audio_coding/audio_coding_tests.gypi b/webrtc/video_engine/video_engine_core_unittests.gyp
similarity index 52%
copy from webrtc/modules/audio_coding/audio_coding_tests.gypi
copy to webrtc/video_engine/video_engine_core_unittests.gyp
index 84ef8673b2720408bbb8c755ad2db49d21616f9b..38bcf5f448e55b498cc51a3a6426fac6b8865230 100644
--- a/webrtc/modules/audio_coding/audio_coding_tests.gypi
+++ b/webrtc/video_engine/video_engine_core_unittests.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
@@ -8,27 +8,30 @@
{
'includes': [
- '../../build/common.gypi',
- 'codecs/isac/isac_test.gypi',
- 'codecs/isac/isacfix_test.gypi',
+ '../build/common.gypi',
],
'targets': [
{
- 'target_name': 'audio_codec_speed_tests',
+ 'target_name': 'video_engine_core_unittests',
'type': '<(gtest_target_type)',
'dependencies': [
- 'audio_processing',
- 'isac_fix',
- 'webrtc_opus',
+ '<(webrtc_root)/webrtc.gyp:webrtc',
+ '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_impl',
+ '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_impl',
'<(DEPTH)/testing/gtest.gyp:gtest',
- '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
+ '<(DEPTH)/testing/gmock.gyp:gmock',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
'sources': [
- 'codecs/isac/fix/test/isac_speed_test.cc',
- 'codecs/opus/opus_speed_test.cc',
- 'codecs/tools/audio_codec_speed_test.h',
- 'codecs/tools/audio_codec_speed_test.cc',
+ 'call_stats_unittest.cc',
+ 'encoder_state_feedback_unittest.cc',
+ 'overuse_frame_detector_unittest.cc',
+ 'payload_router_unittest.cc',
+ 'report_block_stats_unittest.cc',
+ 'stream_synchronization_unittest.cc',
+ 'vie_capturer_unittest.cc',
+ 'vie_codec_unittest.cc',
+ 'vie_remb_unittest.cc',
],
'conditions': [
['OS=="android"', {
@@ -38,15 +41,15 @@
}],
],
},
- ],
+ ], # targets
'conditions': [
['OS=="android"', {
'targets': [
{
- 'target_name': 'audio_codec_speed_tests_apk_target',
+ 'target_name': 'video_engine_core_unittests_apk_target',
'type': 'none',
'dependencies': [
- '<(apk_tests_path):audio_codec_speed_tests_apk',
+ '<(apk_tests_path):video_engine_core_unittests_apk',
],
},
],
@@ -54,16 +57,16 @@
['test_isolation_mode != "noop"', {
'targets': [
{
- 'target_name': 'audio_codec_speed_tests_run',
+ 'target_name': 'video_engine_core_unittests_run',
'type': 'none',
'dependencies': [
- 'audio_codec_speed_tests',
+ 'video_engine_core_unittests',
],
'includes': [
- '../../build/isolate.gypi',
+ '../build/isolate.gypi',
],
'sources': [
- 'audio_codec_speed_tests.isolate',
+ 'video_engine_core_unittests.isolate',
],
},
],
« no previous file with comments | « webrtc/video_engine/video_engine_core.gypi ('k') | webrtc/webrtc.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698