zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of Enable GN check for webrtc/{ortc,p2p} (patchset #4 id:60001 of https://codereview.webrtc.org/2714263004/ )

Browse Source 
Reason for revert:
Fails compile in Chromium for NaCl:
https://build.chromium.org/p/chromium.webrtc.fyi/builders/Win%20Builder/builds/9320/
 http://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/22215
http://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/14501

Original issue's description:
> Enable GN check for webrtc/{ortc,p2p}
>
> Introduce new target //webrtc/p2p:rtc_p2p_test_utils to host
> test-related utilities.
> Previously uncovered header "base/fakecandidatepair.h" is now also in a target.
>
> BUG=webrtc:6828
>
> Review-Url: https://codereview.webrtc.org/2714263004
> Cr-Commit-Position: refs/heads/master@{#17036}
> Committed: c9515b6ce6

TBR=deadbeef@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6828

Review-Url: https://codereview.webrtc.org/2735583002
Cr-Commit-Position: refs/heads/master@{#17038}
This commit is contained in:
kjellander
2017-03-04 15:08:44 -08:00
committed by Commit bot
parent 991f8294cf
commit 98e1531012
3 changed files with 9 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gn
View File

@ -43,8 +43,6 @@ check_targets = [
"//webrtc/modules/video_coding/*",
"//webrtc/modules/video_processing/*",
"//webrtc/modules/remote_bitrate_estimator/*",
"//webrtc/ortc/*",
"//webrtc/p2p/*",
"//webrtc/stats/*",
"//webrtc/voice_engine/*",
]

15
webrtc/ortc/BUILD.gn
View File

@ -33,16 +33,7 @@ rtc_static_library("ortc") {
# PeerConnection code shares, so that ortc can depend on that instead of
# libjingle_peerconnection.
deps = [
"../base:rtc_base",
"../base:rtc_base_approved",
"../call:call_interfaces",
"../logging:rtc_event_log_api",
"../media:rtc_media",
"../media:rtc_media_base",
"../modules/audio_coding:builtin_audio_decoder_factory",
"../p2p:rtc_p2p",
"../pc:libjingle_peerconnection",
"../pc:rtc_pc",
]
public_deps = [
@ -74,16 +65,10 @@ if (rtc_include_tests) {
deps = [
":ortc",
"../base:rtc_base",
"../base:rtc_base_approved",
"../base:rtc_base_tests_main",
"../base:rtc_base_tests_utils",
"../media:rtc_unittest_main",
"../p2p:rtc_p2p",
"../p2p:rtc_p2p_test_utils",
"../pc:pc_test_utils",
"../system_wrappers:metrics_default",
"../test:test_support",
]
if (!build_with_chromium && is_clang) {

47
webrtc/p2p/BUILD.gn
View File

@ -83,10 +83,7 @@ rtc_static_library("rtc_p2p") {
defines = []
deps = [
"../api:libjingle_peerconnection_api",
"../api:ortc_api",
"../base:rtc_base",
"../system_wrappers",
]
if (rtc_build_expat) {
@ -148,7 +145,13 @@ if (rtc_include_tests) {
sources = [
"base/asyncstuntcpsocket_unittest.cc",
"base/dtlstransportchannel_unittest.cc",
"base/fakedtlstransport.h",
"base/fakeicetransport.h",
"base/fakepackettransport.h",
"base/fakeportallocator.h",
"base/faketransportcontroller.h",
"base/jseptransport_unittest.cc",
"base/mockicetransport.h",
"base/p2ptransportchannel_unittest.cc",
"base/port_unittest.cc",
"base/portallocator_unittest.cc",
@ -160,6 +163,9 @@ if (rtc_include_tests) {
"base/stunrequest_unittest.cc",
"base/stunserver_unittest.cc",
"base/tcpport_unittest.cc",
"base/testrelayserver.h",
"base/teststunserver.h",
"base/testturnserver.h",
"base/transportcontroller_unittest.cc",
"base/transportdescriptionfactory_unittest.cc",
"base/turnport_unittest.cc",
@ -178,13 +184,7 @@ if (rtc_include_tests) {
}
deps = [
":rtc_p2p",
":rtc_p2p_test_utils",
"../api:fakemetricsobserver",
"../api:ortc_api",
"../base:rtc_base",
"../base:rtc_base_approved",
"../base:rtc_base_tests_utils",
"../test:test_support",
"//testing/gmock",
"//testing/gtest",
]
@ -194,30 +194,6 @@ if (rtc_include_tests) {
}
defines = [ "GTEST_RELATIVE_PATH" ]
}
rtc_source_set("rtc_p2p_test_utils") {
testonly = true
sources = [
"base/fakecandidatepair.h",
"base/fakedtlstransport.h",
"base/fakeicetransport.h",
"base/fakepackettransport.h",
"base/fakeportallocator.h",
"base/faketransportcontroller.h",
"base/mockicetransport.h",
"base/testrelayserver.h",
"base/teststunserver.h",
"base/testturnserver.h",
]
deps = [
":rtc_p2p",
"../api:ortc_api",
"../base:rtc_base",
"../base:rtc_base_approved",
"../base:rtc_base_tests_utils",
"../test:test_support",
]
}
}
rtc_static_library("libstunprober") {
@ -232,7 +208,6 @@ rtc_static_library("libstunprober") {
}
deps = [
":rtc_p2p",
"..:webrtc_common",
"../base:rtc_base",
]
@ -246,10 +221,6 @@ if (rtc_include_tests) {
]
deps = [
":libstunprober",
":rtc_p2p",
":rtc_p2p_test_utils",
"../base:rtc_base",
"../base:rtc_base_tests_utils",
"//testing/gmock",
"//testing/gtest",
]