diff options
| author | andresp@webrtc.org <andresp@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-14 12:24:04 +0000 |
|---|---|---|
| committer | andresp@webrtc.org <andresp@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-14 12:24:04 +0000 |
| commit | 0b8a1c4ea54e6ad9597f6e3fe382d5facbc147cb (patch) | |
| tree | f60808a32a06afcb7f61de3815b1113028f282a3 /webrtc_tests.gypi | |
| parent | c4e54b6b46c22c03725c9d39612fd50792d018ef (diff) | |
| download | webrtc-0b8a1c4ea54e6ad9597f6e3fe382d5facbc147cb.tar.gz | |
Add webrtc field trials API.
From now on it is expected that code linking system_wrappers.gyp:system_wrappers
provides an implementation for field_trial API or links with the default one in
system_wrappers.gyp:field_trial_default.
Note: Since there is no use of webrtc::field_trial API inside webrtc this CL on
itself does not forces the clients to actually define it. It however lays the
API and updates the gyp rules to link with so that it is ready to use.
Tested: Introduced a use of field trial in system wrappers and make sure all
bots were building successfully.
BUG=crbug/367114
R=tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/14489004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6147 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc_tests.gypi')
| -rw-r--r-- | webrtc_tests.gypi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webrtc_tests.gypi b/webrtc_tests.gypi index 384f57cc..31609670 100644 --- a/webrtc_tests.gypi +++ b/webrtc_tests.gypi @@ -26,6 +26,7 @@ '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', 'test/webrtc_test_common.gyp:webrtc_test_common', + '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:field_trial_default', 'webrtc', ], }, @@ -39,13 +40,13 @@ 'video/video_send_stream_tests.cc', 'test/common_unittest.cc', 'test/testsupport/metrics/video_metrics_unittest.cc', - 'test/test_main.cc', ], 'dependencies': [ '<(DEPTH)/testing/gtest.gyp:gtest', 'modules/modules.gyp:rtp_rtcp', 'test/metrics.gyp:metrics', 'test/webrtc_test_common.gyp:webrtc_test_common', + 'test/test.gyp:test_main', 'webrtc', ], }, @@ -54,7 +55,6 @@ 'type': '<(gtest_target_type)', 'sources': [ 'modules/audio_coding/neteq4/test/neteq_performance_unittest.cc', - 'test/test_main.cc', 'video/call_perf_tests.cc', 'video/full_stack.cc', 'video/rampup_tests.cc', @@ -64,6 +64,7 @@ 'modules/modules.gyp:neteq_test_support', # Needed by neteq_performance_unittest. 'modules/modules.gyp:rtp_rtcp', 'test/webrtc_test_common.gyp:webrtc_test_common', + 'test/test.gyp:test_main', 'webrtc', ], }, |