Stop using public_deps in pc/.
TBR=phoglund@webrtc.org
Bug: webrtc:8603
Change-Id: If18e5a4d212392bbd9b4e1f9c2f00ee79a2ab348
No-Try: True
Reviewed-on: https://webrtc-review.googlesource.com/29864
Reviewed-by: Edward Lemur <ehmaldonado@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21139}diff --git a/media/BUILD.gn b/media/BUILD.gn
index a15dd29..754a89a 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -430,6 +430,7 @@
deps = [
"../api:video_frame_api_i420",
"../pc:rtc_pc",
+ "../pc:rtc_pc_base",
"../test:field_trial",
]
sources = [
diff --git a/ortc/BUILD.gn b/ortc/BUILD.gn
index 4c1d51b..d280a9d 100644
--- a/ortc/BUILD.gn
+++ b/ortc/BUILD.gn
@@ -33,6 +33,7 @@
# PeerConnection code shares, so that ortc can depend on that instead of
# libjingle_peerconnection.
deps = [
+ "../api:libjingle_peerconnection_api",
"../api:optional",
"../api:ortc_api",
"../call:call_interfaces",
@@ -43,7 +44,9 @@
"../modules/audio_processing:audio_processing",
"../p2p:rtc_p2p",
"../pc:libjingle_peerconnection",
+ "../pc:peerconnection",
"../pc:rtc_pc",
+ "../pc:rtc_pc_base",
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
]
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index d6260a9..41a3898 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -13,7 +13,7 @@
}
group("pc") {
- public_deps = [
+ deps = [
":rtc_pc",
]
}
@@ -92,11 +92,8 @@
}
rtc_source_set("rtc_pc") {
- public_deps = [
- ":rtc_pc_base",
- ]
-
deps = [
+ ":rtc_pc_base",
"../media:rtc_audio_video",
]
}
@@ -176,6 +173,7 @@
":rtc_pc_base",
"..:webrtc_common",
"../api:call_api",
+ "../api:libjingle_peerconnection_api",
"../api:optional",
"../api:rtc_stats_api",
"../api/video_codecs:video_codecs_api",
@@ -190,10 +188,6 @@
"../system_wrappers",
"../system_wrappers:field_trial_api",
]
-
- public_deps = [
- "../api:libjingle_peerconnection_api",
- ]
}
# This target implements CreatePeerConnectionFactory methods that will create a
@@ -233,7 +227,7 @@
}
rtc_source_set("libjingle_peerconnection") {
- public_deps = [
+ deps = [
":create_pc_factory",
":peerconnection",
"../api:libjingle_peerconnection_api",
@@ -287,7 +281,9 @@
":libjingle_peerconnection",
":pc_test_utils",
":rtc_pc",
+ ":rtc_pc_base",
"../api:array_view",
+ "../api:libjingle_peerconnection_api",
"../logging:rtc_event_log_api",
"../media:rtc_media_base",
"../media:rtc_media_tests_utils",
@@ -333,6 +329,7 @@
deps = [
":libjingle_peerconnection",
+ ":peerconnection",
":rtc_pc_base",
"..:webrtc_common",
"../api:libjingle_peerconnection_test_api",
@@ -436,7 +433,10 @@
]
}
- deps = []
+ deps = [
+ ":peerconnection",
+ ":rtc_pc_base",
+ ]
if (is_android) {
deps += [ ":android_black_magic" ]
}
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index e68e748..544c112 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -339,6 +339,8 @@
":video_objc",
":videotoolbox_objc",
":videotracksource_objc",
+ "../api:libjingle_peerconnection_api",
+ "../api:peerconnection_and_implicit_call_api",
"../api:video_frame_api",
"../api/audio_codecs:builtin_audio_decoder_factory",
"../api/audio_codecs:builtin_audio_encoder_factory",
@@ -505,6 +507,8 @@
":common_objc",
":corevideoframebuffer_objc",
":videotracksource_objc",
+ "../api:libjingle_peerconnection_api",
+ "../api:peerconnection_and_implicit_call_api",
"../api:video_frame_api",
"../api/video_codecs:video_codecs_api",
"../common_video",
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index c484fd9..d12e8c1 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -362,6 +362,8 @@
":generated_external_classes_jni",
":generated_peerconnection_jni",
"../..:webrtc_common",
+ "../../api:libjingle_peerconnection_api",
+ "../../api:peerconnection_and_implicit_call_api",
"../../api/video_codecs:video_codecs_api",
"../../media:rtc_data",
"../../media:rtc_media_base",
diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
index 0aee276..493fd7f 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -354,6 +354,7 @@
"sdp_parser_fuzzer.cc",
]
deps = [
+ "../../api:libjingle_peerconnection_api",
"../../pc:libjingle_peerconnection",
]
seed_corpus = "corpora/sdp-corpus"
