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}
diff --git a/.gn b/.gn
index 547ca84..a0be63d 100644
--- a/.gn
+++ b/.gn
@@ -43,6 +43,8 @@
"//webrtc/modules/video_coding/*",
"//webrtc/modules/video_processing/*",
"//webrtc/modules/remote_bitrate_estimator/*",
+ "//webrtc/ortc/*",
+ "//webrtc/p2p/*",
"//webrtc/stats/*",
"//webrtc/voice_engine/*",
]
diff --git a/webrtc/ortc/BUILD.gn b/webrtc/ortc/BUILD.gn
index 9e1c18f..e1fb225 100644
--- a/webrtc/ortc/BUILD.gn
+++ b/webrtc/ortc/BUILD.gn
@@ -33,7 +33,16 @@
# 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 = [
@@ -65,10 +74,16 @@
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) {
diff --git a/webrtc/p2p/BUILD.gn b/webrtc/p2p/BUILD.gn
index 07fcdf4..6f65bba 100644
--- a/webrtc/p2p/BUILD.gn
+++ b/webrtc/p2p/BUILD.gn
@@ -83,7 +83,10 @@
defines = []
deps = [
+ "../api:libjingle_peerconnection_api",
+ "../api:ortc_api",
"../base:rtc_base",
+ "../system_wrappers",
]
if (rtc_build_expat) {
@@ -145,13 +148,7 @@
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",
@@ -163,9 +160,6 @@
"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",
@@ -184,7 +178,13 @@
}
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,6 +194,30 @@
}
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") {
@@ -208,6 +232,7 @@
}
deps = [
+ ":rtc_p2p",
"..:webrtc_common",
"../base:rtc_base",
]
@@ -221,6 +246,10 @@
]
deps = [
":libstunprober",
+ ":rtc_p2p",
+ ":rtc_p2p_test_utils",
+ "../base:rtc_base",
+ "../base:rtc_base_tests_utils",
"//testing/gmock",
"//testing/gtest",
]