Remove metrics_default from rtc_media dependencies.

By not providing the default implementation of the metrics API
it becomes possible for users of rtc_media to choose which
implementation to use. The dependency is moved into each test
target that uses it instead.

NOTRY=True
NOPRESUBMIT=True

Review-Url: https://codereview.webrtc.org/2026223002
Cr-Commit-Position: refs/heads/master@{#12991}
This commit is contained in:
kjellander 2016-06-01 05:28:54 -07:00 committed by Commit bot
parent d79599d74a
commit 98bba39816
8 changed files with 10 additions and 1 deletions

View File

@ -39,6 +39,7 @@
'dependencies': [
'<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
'legacy_objc_api.gyp:libjingle_peerconnection_objc',
],
'sources': [
@ -71,6 +72,7 @@
'dependencies': [
'<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
'<(webrtc_root)/webrtc_examples.gyp:apprtc_signaling',
'<(DEPTH)/third_party/ocmock/ocmock.gyp:ocmock',
],

View File

@ -29,6 +29,7 @@
'type': 'static_library',
'dependencies': [
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
'libjingle_peerconnection',
],
'sources': [

View File

@ -19,6 +19,7 @@
'<(webrtc_root)/common.gyp:webrtc_common',
'<(webrtc_root)/media/media.gyp:rtc_unittest_main',
'<(webrtc_root)/pc/pc.gyp:rtc_pc',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
],
'direct_dependent_settings': {
'include_dirs': [

View File

@ -17,7 +17,6 @@
'<(webrtc_root)/common.gyp:webrtc_common',
'<(webrtc_root)/webrtc.gyp:webrtc',
'<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
'<(webrtc_root)/p2p/p2p.gyp:rtc_p2p',
],
@ -252,6 +251,7 @@
'dependencies': [
'<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'<(webrtc_root)/media/media.gyp:rtc_media',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
'rtc_unittest_main',
],
'sources': [

View File

@ -79,6 +79,7 @@
'<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'<(webrtc_root)/media/media.gyp:rtc_unittest_main',
'<(webrtc_root)/pc/pc.gyp:rtc_pc',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
],
'include_dirs': [
'<(DEPTH)/third_party/libsrtp/srtp',

View File

@ -263,6 +263,7 @@
],
'dependencies': [
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
'rtc_sdk_peerconnection_objc',
],
'xcode_settings': {

View File

@ -20,6 +20,7 @@
'dependencies': [
'<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'<(webrtc_root)/sdk/sdk.gyp:rtc_sdk_peerconnection_objc',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
],
'sources': [
'objc/Framework/UnitTests/RTCConfigurationTest.mm',

View File

@ -80,6 +80,7 @@
'dependencies': [
'api/api.gyp:libjingle_peerconnection',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
],
'conditions': [
['build_json==1', {
@ -156,6 +157,7 @@
'dependencies': [
'<(webrtc_root)/sdk/sdk.gyp:rtc_sdk_common_objc',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
],
'sources': [
'examples/objc/AppRTCDemo/common/ARDUtilities.h',