admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of Add field_trial_default dependency to libjingle_peerconnection (patchset #3 id:40001 of https://codereview.webrtc.org/2120673004/ )

Browse Source 
Reason for revert:
Breaks chromium.

Original issue's description:
> Add field_trial_default dependency to libjingle_peerconnection
>
> This is needed for webrtc::field_trial::FindFullName in peerconnection.cc
>
> NOTRY=True
>
> Committed: https://crrev.com/a7a01df2aebe7108afad208ccd0341c2f0bc7b3b
> Cr-Commit-Position: refs/heads/master@{#13836}

TBR=pthatcher@webrtc.org,pthatcher@chromium.org,kjellander@webrtc.org,arlolra@gmail.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review-Url: https://codereview.webrtc.org/2263063002
Cr-Commit-Position: refs/heads/master@{#13837}
This commit is contained in:
sakal 2016-08-22 00:26:01 -07:00 committed by Commit bot
parent a7a01df2ae
commit 86ccd7bfba
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -4,7 +4,6 @@
Alexander Brauckmann <a.brauckmann@gmail.com>
Andrew MacDonald <andrew@webrtc.org>
Anil Kumar <an1kumar@gmail.com>
Arlo Breault <arlolra@gmail.com>
Ben Strong <bstrong@gmail.com>
Bob Withers <bwit@pobox.com>
Bridger Maxwell <bridgeyman@gmail.com>

2
webrtc/api/BUILD.gn
View File

@ -113,7 +113,6 @@ source_set("libjingle_peerconnection") {
"../call",
"../media",
"../pc",
"../system_wrappers:field_trial_default",
]
if (rtc_use_quic) {
@ -199,6 +198,7 @@ if (is_android && !build_with_chromium) {
deps = [
":libjingle_peerconnection",
"../system_wrappers:field_trial_default",
"../system_wrappers:metrics_default",
]

2
webrtc/api/api.gyp
View File

@ -30,6 +30,7 @@
'target_name': 'libjingle_peerconnection_jni',
'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',
],
@ -103,7 +104,6 @@
'dependencies': [
'<(webrtc_root)/media/media.gyp:rtc_media',
'<(webrtc_root)/pc/pc.gyp:rtc_pc',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
],
'sources': [
'audiotrack.cc',